diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-12 09:23:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-12 09:23:36 +0000 |
| commit | cd82c8b31f82f535c69a3c4f3c86dd9c9e1123dc (patch) | |
| tree | c065201a8b02e5cc1efe8f37480fc34e375478f8 | |
| parent | b65364353b8af34317a0d48ba47cecd3c48d5c40 (diff) | |
| download | ATCD-cd82c8b31f82f535c69a3c4f3c86dd9c9e1123dc.tar.gz | |
Mon Feb 12 09:20:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
149 files changed, 439 insertions, 1737 deletions
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp index 978df100a3e..aa1359906aa 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp @@ -76,7 +76,6 @@ AMH_Servant::parse_args (int &argc, char **argv) void AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, Test::Timestamp send_time) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -121,7 +120,6 @@ AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, void AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -135,7 +133,6 @@ AMH_Servant::start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh) void AMH_Servant::end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.h b/TAO/examples/AMH/Sink_Server/AMH_Servant.h index 26db1af6dba..ea66a38b1b9 100644 --- a/TAO/examples/AMH/Sink_Server/AMH_Servant.h +++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.h @@ -33,15 +33,12 @@ public: virtual int parse_args (int& argc, char **argv); // = The skeleton methods - virtual void start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh); - virtual void end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void end_test (Test::AMH_RoundtripResponseHandler_ptr _tao_rh); virtual void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::Timestamp send_time); protected: ACE_Reactor *reactor_; diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.cpp b/TAO/examples/AMI/FL_Callback/Peer_i.cpp index 48699b49cdd..60c59f02396 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp @@ -12,7 +12,6 @@ Peer_Handler_i::Peer_Handler_i (Peer_i *peer) void Peer_Handler_i::request (CORBA::Long retval) - ACE_THROW_SPEC ((CORBA::SystemException)) { static int i = 0; i++; @@ -25,19 +24,16 @@ Peer_Handler_i::request (CORBA::Long retval) void Peer_Handler_i::request_excep ( ::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Peer_Handler_i::start (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Peer_Handler_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -55,7 +51,6 @@ void Peer_i::init (CORBA::ORB_ptr orb, Progress_ptr progress, const ACE_Time_Value &delay) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_ = CORBA::ORB::_duplicate (orb); this->progress_ = Progress::_duplicate (progress); @@ -69,14 +64,12 @@ Peer_i::init (CORBA::ORB_ptr orb, void Peer_i::reply (CORBA::Long result) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->progress_->recv_reply (result); } CORBA::Long Peer_i::request (CORBA::Long id) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value tv = this->delay_; ACE_OS::sleep (tv); @@ -87,7 +80,6 @@ Peer_i::request (CORBA::Long id) void Peer_i::start (const PeerSet &the_peers, CORBA::Long iterations) - ACE_THROW_SPEC ((CORBA::SystemException)) { AMI_PeerHandler_var handler = this->reply_handler_._this (); @@ -104,7 +96,6 @@ Peer_i::start (const PeerSet &the_peers, void Peer_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h index 99e5436445e..f778761bb69 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.h +++ b/TAO/examples/AMI/FL_Callback/Peer_i.h @@ -27,17 +27,13 @@ public: Peer_Handler_i (Peer_i *peer); // The peer - virtual void request (CORBA::Long retval) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void request (CORBA::Long retval); - virtual void request_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void request_excep (::Messaging::ExceptionHolder * excep_holder); - virtual void start (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: Peer_i *peer_; @@ -55,24 +51,19 @@ public: void init (CORBA::ORB_ptr orb, Progress_ptr progress, - const ACE_Time_Value &delay) - ACE_THROW_SPEC ((CORBA::SystemException)); + const ACE_Time_Value &delay); - void reply (CORBA::Long result) - ACE_THROW_SPEC ((CORBA::SystemException)); + void reply (CORBA::Long result); // Used by the Reply_Handler to indicate that a reply has been // received. // = See test.idl for an explanation of these methods. - CORBA::Long request (CORBA::Long id) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long request (CORBA::Long id); void start (const PeerSet& the_peers, - CORBA::Long iterations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long iterations); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: Peer_Handler_i reply_handler_; diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.cpp b/TAO/examples/AMI/FL_Callback/Progress_i.cpp index 4bf0e7e1054..d998c68fc29 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.cpp +++ b/TAO/examples/AMI/FL_Callback/Progress_i.cpp @@ -16,7 +16,6 @@ Progress_i::Progress_i (Progress_Window *window) void Progress_i::sent_request (CORBA::Long id) - ACE_THROW_SPEC ((CORBA::SystemException)) { //ACE_DEBUG ((LM_DEBUG, "Progress (%t) - sent request %d\n", id)); this->window_->sent_request (id); @@ -24,14 +23,12 @@ Progress_i::sent_request (CORBA::Long id) void Progress_i::recv_reply (CORBA::Long id) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->window_->recv_reply (id); } CORBA::Long Progress_i::bind (Peer_ptr a_peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Progress (%t) - peer bound\n")); return this->window_->bind (a_peer); diff --git a/TAO/examples/AMI/FL_Callback/Progress_i.h b/TAO/examples/AMI/FL_Callback/Progress_i.h index 3761dd58206..7d9c8fbe9ee 100644 --- a/TAO/examples/AMI/FL_Callback/Progress_i.h +++ b/TAO/examples/AMI/FL_Callback/Progress_i.h @@ -73,12 +73,9 @@ public: // ctor // = The Progress methods. - void sent_request (CORBA::Long id) - ACE_THROW_SPEC ((CORBA::SystemException)); - void recv_reply (CORBA::Long id) - ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Long bind (Peer_ptr a_peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + void sent_request (CORBA::Long id); + void recv_reply (CORBA::Long id); + CORBA::Long bind (Peer_ptr a_peer); private: Progress_Window* window_; diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp index acc617edb2d..4304f182270 100644 --- a/TAO/examples/Buffered_AMI/client.cpp +++ b/TAO/examples/Buffered_AMI/client.cpp @@ -53,7 +53,6 @@ class Reply_Handler : public POA_AMI_testHandler { public: void method (CORBA::ULong reply_number) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "client: AMI Reply %d @ %T\n", @@ -65,7 +64,6 @@ public: } void method_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -78,12 +76,10 @@ public: } void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void shutdown_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/examples/Buffered_AMI/test_i.cpp b/TAO/examples/Buffered_AMI/test_i.cpp index 683b7cb6ed7..188952f828e 100644 --- a/TAO/examples/Buffered_AMI/test_i.cpp +++ b/TAO/examples/Buffered_AMI/test_i.cpp @@ -12,7 +12,6 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number, CORBA::ULong_out reply_number) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "server: Iteration %d @ %T\n", @@ -23,7 +22,6 @@ test_i::method (CORBA::ULong request_number, void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/examples/Buffered_AMI/test_i.h b/TAO/examples/Buffered_AMI/test_i.h index e1263790a91..d136bfb0567 100644 --- a/TAO/examples/Buffered_AMI/test_i.h +++ b/TAO/examples/Buffered_AMI/test_i.h @@ -29,11 +29,9 @@ public: // = The test interface methods. void method (CORBA::ULong request_number, - CORBA::ULong_out reply_number) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong_out reply_number); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Buffered_Oneways/test_i.cpp b/TAO/examples/Buffered_Oneways/test_i.cpp index ab9ad6c7c48..08011a0f403 100644 --- a/TAO/examples/Buffered_Oneways/test_i.cpp +++ b/TAO/examples/Buffered_Oneways/test_i.cpp @@ -11,7 +11,6 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "server: Iteration %d @ %T\n", @@ -20,7 +19,6 @@ test_i::method (CORBA::ULong request_number) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/examples/Buffered_Oneways/test_i.h b/TAO/examples/Buffered_Oneways/test_i.h index 674e65be4f9..bed392b0324 100644 --- a/TAO/examples/Buffered_Oneways/test_i.h +++ b/TAO/examples/Buffered_Oneways/test_i.h @@ -28,11 +28,9 @@ public: // ctor. // = The test interface methods. - void method (CORBA::ULong request_number) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (CORBA::ULong request_number); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp index f5659723d0e..83ecc32166d 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp @@ -25,7 +25,6 @@ Foo_i::~Foo_i() void Foo_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -35,7 +34,6 @@ Foo_i::op1(void) void Foo_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op2_; this->value_ = value; @@ -44,7 +42,6 @@ Foo_i::op2(CORBA::Long value) CORBA::Long Foo_i::op3(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op3_; return this->value_; @@ -53,7 +50,6 @@ Foo_i::op3(void) void Foo_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op4_; this->value_ = value; @@ -72,16 +68,13 @@ Foo_i::op4(CORBA::Long value) void Foo_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { - ++this->count_op5_; - ACE_THROW_SPEC (FooException()); + ++this->count_op5_;; } void Foo_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { unsigned num_left = --this->num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h index 2829a446f59..b7b33f0638e 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h @@ -14,23 +14,17 @@ class Foo_i : public virtual POA_Foo Foo_i(unsigned num_clients); virtual ~Foo_i(); - virtual void op1(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op1(void); - virtual void op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(void); - virtual void op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op4(CORBA::Long value); - virtual void op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)); + virtual void op5(void); - virtual void done(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void done(void); private: diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp index a6773b691ee..461047110cc 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp @@ -23,7 +23,6 @@ Foo_i::~Foo_i() void Foo_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -33,7 +32,6 @@ Foo_i::op1(void) void Foo_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op2_; this->value_ = value; @@ -42,7 +40,6 @@ Foo_i::op2(CORBA::Long value) CORBA::Long Foo_i::op3(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op3_; return this->value_; @@ -51,7 +48,6 @@ Foo_i::op3(void) void Foo_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op4_; this->value_ = value; @@ -70,16 +66,13 @@ Foo_i::op4(CORBA::Long value) void Foo_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { - ++this->count_op5_; - ACE_THROW_SPEC (FooException()); + ++this->count_op5_;; } void Foo_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->mgr_->client_done(); } diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h index e81153d9dc6..695b1219e49 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h @@ -16,23 +16,17 @@ class Foo_i : public virtual POA_Foo Foo_i(const char* servant_name, FooServantList* mgr); virtual ~Foo_i(); - virtual void op1(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op1(void); - virtual void op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(void); - virtual void op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op4(CORBA::Long value); - virtual void op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)); + virtual void op5(void); - virtual void done(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void done(void); private: diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp index bbc9b5fa385..426b75936a0 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp @@ -17,14 +17,12 @@ Foo_i::~Foo_i() void Foo_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { } void Foo_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->value_ = value; } @@ -32,7 +30,6 @@ Foo_i::op2(CORBA::Long value) CORBA::Long Foo_i::op3(void) - ACE_THROW_SPEC((CORBA::SystemException)) { return this->value_; } @@ -41,7 +38,6 @@ Foo_i::op3(void) void Foo_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->value_ = value; } @@ -49,7 +45,6 @@ Foo_i::op4(CORBA::Long value) void Foo_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { throw FooException(); } @@ -57,7 +52,6 @@ Foo_i::op5(void) void Foo_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { unsigned num_left = --this->num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h index 7bd860e3640..eb1ca654c5a 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h @@ -12,23 +12,17 @@ class Foo_i : public virtual POA_Foo Foo_i(unsigned num_clients); virtual ~Foo_i(); - virtual void op1(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op1(void); - virtual void op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(void); - virtual void op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op4(CORBA::Long value); - virtual void op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)); + virtual void op5(void); - virtual void done(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void done(void); private: diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp index 61712fb4fae..9c328747bfc 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp @@ -15,9 +15,6 @@ Callback_i::~Callback_i () void Callback_i::test_method ( ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n")); diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h index d9e41b60de4..18f8b0f6631 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h @@ -14,10 +14,7 @@ class Callback_i : public virtual POA_Callback virtual ~Callback_i(); virtual void test_method ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp index 9ae1781b873..56d95507f92 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp @@ -22,7 +22,6 @@ Foo_i::~Foo_i() void Foo_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -32,7 +31,6 @@ Foo_i::op1(void) void Foo_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op2_; this->value_ = value; @@ -41,7 +39,6 @@ Foo_i::op2(CORBA::Long value) CORBA::Long Foo_i::op3(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op3_; return this->value_; @@ -50,7 +47,6 @@ Foo_i::op3(void) void Foo_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op4_; this->value_ = value; @@ -69,14 +65,12 @@ Foo_i::op4(CORBA::Long value) void Foo_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - ENTER\n")); ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Increment counter.\n")); unsigned newcount = ++this->count_op5_; ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Counter is now %d.\n", newcount)); - ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n")); - ACE_THROW_SPEC (FooException()); + ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n"));; } @@ -85,9 +79,6 @@ Foo_i::op6 ( const char * user_name, char *& message ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_CString str(message); str += user_name; @@ -101,9 +92,6 @@ void Foo_i::test_unbounded_string_arg ( const char * message ) -ACE_THROW_SPEC (( -CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ") ACE_TEXT("got unbounded string %s\n"), @@ -115,9 +103,6 @@ void Foo_i::test_bounded_string_arg ( const char * message ) -ACE_THROW_SPEC (( -CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ") ACE_TEXT("got bounded string %s\n"), @@ -129,9 +114,6 @@ void Foo_i::test_fixed_array_arg ( const ::Fixed_Array message ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { for (CORBA::ULong i = 0; i < 20; i++) { @@ -146,9 +128,6 @@ void Foo_i::test_bounded_var_size_arg ( const ::Bounded_Var_Size & message ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ") ACE_TEXT("got var array chars %s\n"), @@ -160,9 +139,6 @@ void Foo_i::test_unbounded_var_size_arg ( const ::Unbounded_Var_Size & message ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_var_size_arg ") ACE_TEXT("got var array chars %s\n"), @@ -174,9 +150,6 @@ void Foo_i::test_fixed_size_arg ( const ::TimeOfDay & t ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg ") ACE_TEXT("got timeofday %d:%d:%d\n"), @@ -187,9 +160,6 @@ void Foo_i::test_fixed_size_arg_two_way ( const ::TimeOfDay & t ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg_two_way ") ACE_TEXT("got timeofday %d:%d:%d\n"), @@ -200,9 +170,6 @@ void Foo_i::test_var_array_arg ( const ::Var_Array messages ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ") ACE_TEXT(" %s \n"), messages[0].in ())); @@ -217,9 +184,6 @@ void Foo_i::test_special_basic_arg ( ::CORBA::Boolean value ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ") ACE_TEXT(" got special basic arg: %d \n"), value)); @@ -230,9 +194,6 @@ void Foo_i::test_objref_arg ( ::Callback_ptr cb ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { this->callback_ = Callback::_duplicate (cb); ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ") @@ -244,9 +205,6 @@ void Foo_i::callback_object ( ::Callback_ptr cb ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { this->callback_ = Callback::_duplicate (cb); } @@ -254,9 +212,6 @@ ACE_THROW_SPEC (( void Foo_i::test_callback ( ) -ACE_THROW_SPEC (( - CORBA::SystemException, FooException -)) { if (CORBA::is_nil (this->callback_.in ())) { @@ -271,7 +226,6 @@ ACE_THROW_SPEC (( void Foo_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> num_clients = 2; diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h index bb209487d87..bda78300650 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h @@ -17,114 +17,69 @@ class Foo_i : public virtual POA_Foo Foo_i(const char* servant_name); virtual ~Foo_i(); - virtual void op1(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op1(void); - virtual void op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(void); - virtual void op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op4(CORBA::Long value); - virtual void op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)); + virtual void op5(void); virtual CORBA::Boolean op6 ( const char * user_name, char *& message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_unbounded_string_arg ( const char * message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_bounded_string_arg ( const char * message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_fixed_array_arg ( const ::Fixed_Array message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_var_array_arg ( const ::Var_Array messages - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_bounded_var_size_arg ( const ::Bounded_Var_Size & message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_unbounded_var_size_arg ( const ::Unbounded_Var_Size & message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_fixed_size_arg ( const ::TimeOfDay & t - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_fixed_size_arg_two_way ( const ::TimeOfDay & t - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_special_basic_arg ( ::CORBA::Boolean value - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_objref_arg ( ::Callback_ptr cb - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void callback_object ( ::Callback_ptr cb - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_callback ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException, FooException - )); + ); - virtual void done(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void done(void); private: diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp index 61712fb4fae..9c328747bfc 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp @@ -15,9 +15,6 @@ Callback_i::~Callback_i () void Callback_i::test_method ( ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n")); diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h index 016ff3fb464..d45d948fb53 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h @@ -14,10 +14,7 @@ class Callback_i : public virtual POA_Callback virtual ~Callback_i(); virtual void test_method ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp index de8c5c5b9e8..e749ebdab9f 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp @@ -24,7 +24,6 @@ Foo_i::~Foo_i() void Foo_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -34,7 +33,6 @@ Foo_i::op1(void) void Foo_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op2_; this->value_ = value; @@ -43,7 +41,6 @@ Foo_i::op2(CORBA::Long value) CORBA::Long Foo_i::op3(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op3_; @@ -58,7 +55,6 @@ Foo_i::op3(void) void Foo_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op4_; this->value_ = value; @@ -77,7 +73,6 @@ Foo_i::op4(CORBA::Long value) void Foo_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { ++this->count_op5_; throw FooException(); @@ -89,9 +84,6 @@ Foo_i::op6 ( const char * user_name, char *& message ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_CString str(message); str += user_name; @@ -105,9 +97,6 @@ void Foo_i::test_unbounded_string_arg ( const char * message ) -ACE_THROW_SPEC (( -CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ") ACE_TEXT("got unbounded string %s\n"), @@ -119,9 +108,6 @@ void Foo_i::test_bounded_string_arg ( const char * message ) -ACE_THROW_SPEC (( -CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ") ACE_TEXT("got bounded string %s\n"), @@ -133,9 +119,6 @@ void Foo_i::test_fixed_array_arg ( const ::Fixed_Array message ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { for (CORBA::ULong i = 0; i < 20; i++) { @@ -150,9 +133,6 @@ void Foo_i::test_bounded_var_size_arg ( const ::Bounded_Var_Size & message ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ") ACE_TEXT("got var array chars %s\n"), @@ -164,9 +144,6 @@ void Foo_i::test_unbounded_var_size_arg ( const ::Unbounded_Var_Size & message ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_var_size_arg ") ACE_TEXT("got var array chars %s\n"), @@ -178,9 +155,6 @@ void Foo_i::test_fixed_size_arg ( const ::TimeOfDay & t ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg ") ACE_TEXT("got timeofday %d:%d:%d\n"), @@ -191,9 +165,6 @@ void Foo_i::test_fixed_size_arg_two_way ( const ::TimeOfDay & t ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg_two_way ") ACE_TEXT("got timeofday %d:%d:%d\n"), @@ -204,9 +175,6 @@ void Foo_i::test_var_array_arg ( const ::Var_Array messages ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ") ACE_TEXT(" %s \n"), messages[0].in ())); @@ -221,9 +189,6 @@ void Foo_i::test_special_basic_arg ( ::CORBA::Boolean value ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ") ACE_TEXT(" got special basic arg: %d \n"), value)); @@ -234,9 +199,6 @@ void Foo_i::test_objref_arg ( ::Callback_ptr cb ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { this->callback_ = Callback::_duplicate (cb); ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ") @@ -248,9 +210,6 @@ void Foo_i::callback_object ( ::Callback_ptr cb ) -ACE_THROW_SPEC (( - CORBA::SystemException -)) { this->callback_ = Callback::_duplicate (cb); } @@ -258,9 +217,6 @@ ACE_THROW_SPEC (( void Foo_i::test_callback ( ) -ACE_THROW_SPEC (( - CORBA::SystemException, FooException -)) { if (CORBA::is_nil (this->callback_.in ())) { @@ -275,7 +231,6 @@ ACE_THROW_SPEC (( void Foo_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->mgr_->client_done(); } diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h index 9b0db58c201..5173fa40f6e 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h @@ -16,114 +16,69 @@ class Foo_i : public virtual POA_Foo Foo_i(const char* servant_name, FooServantList* mgr); virtual ~Foo_i(); - virtual void op1(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op1(void); - virtual void op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(void); - virtual void op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op4(CORBA::Long value); - virtual void op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)); + virtual void op5(void); virtual CORBA::Boolean op6 ( const char * user_name, char *& message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_unbounded_string_arg ( const char * message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_bounded_string_arg ( const char * message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_fixed_array_arg ( const ::Fixed_Array message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_var_array_arg ( const ::Var_Array messages - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_bounded_var_size_arg ( const ::Bounded_Var_Size & message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_unbounded_var_size_arg ( const ::Unbounded_Var_Size & message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_fixed_size_arg ( const ::TimeOfDay & t - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_fixed_size_arg_two_way ( const ::TimeOfDay & t - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_special_basic_arg ( ::CORBA::Boolean value - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_objref_arg ( ::Callback_ptr cb - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void callback_object ( ::Callback_ptr cb - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_callback ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException, FooException - )); + ); - virtual void done(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void done(void); void active (bool flag); diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp index f2044eb4e8b..336c96d8b53 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp @@ -26,7 +26,6 @@ Foo_i::~Foo_i() void Foo_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op1_; // Sleep for 10 milliseconds (10,000 microseconds) @@ -36,7 +35,6 @@ Foo_i::op1(void) void Foo_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op2_; this->value_ = value; @@ -45,7 +43,6 @@ Foo_i::op2(CORBA::Long value) CORBA::Long Foo_i::op3(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op3_; return this->value_; @@ -54,7 +51,6 @@ Foo_i::op3(void) void Foo_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_op4_; this->value_ = value; @@ -73,7 +69,6 @@ Foo_i::op4(CORBA::Long value) void Foo_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { ++this->count_op5_; throw FooException(); @@ -82,7 +77,6 @@ Foo_i::op5(void) void Foo_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { unsigned num_left = --this->num_clients_; diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h index 2858ec966ad..a5bf36c4040 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h @@ -12,23 +12,17 @@ class Foo_i Foo_i(unsigned num_clients); virtual ~Foo_i(); - virtual void op1(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op1(void); - virtual void op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op2(CORBA::Long value); - virtual CORBA::Long op3(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(void); - virtual void op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void op4(CORBA::Long value); - virtual void op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)); + virtual void op5(void); - virtual void done(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void done(void); private: diff --git a/TAO/examples/Callback_Quoter/Consumer_i.cpp b/TAO/examples/Callback_Quoter/Consumer_i.cpp index 131e606e112..871286236c1 100644 --- a/TAO/examples/Callback_Quoter/Consumer_i.cpp +++ b/TAO/examples/Callback_Quoter/Consumer_i.cpp @@ -29,7 +29,6 @@ Consumer_i::~Consumer_i (void) void Consumer_i::push (const Callback_Quoter::Info &data) - ACE_THROW_SPEC ((CORBA::SystemException)) { // On getting the needed information you now proceed to the next // step, which could be obtaining the shares. @@ -42,7 +41,6 @@ Consumer_i::push (const Callback_Quoter::Info &data) void Consumer_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Instruct the ORB to shutdown. diff --git a/TAO/examples/Callback_Quoter/Consumer_i.h b/TAO/examples/Callback_Quoter/Consumer_i.h index efdaa0c8801..0645b3962c9 100644 --- a/TAO/examples/Callback_Quoter/Consumer_i.h +++ b/TAO/examples/Callback_Quoter/Consumer_i.h @@ -39,12 +39,10 @@ public: ~Consumer_i (void); // Destructor. - void push (const Callback_Quoter::Info & data) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const Callback_Quoter::Info & data); // Gets the stock information from the Notifier. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Used to get the consumer to shut down. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp index 5448a187d08..f98cc97b1be 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.cpp +++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp @@ -38,8 +38,6 @@ void Notifier_i::register_callback (const char *stock_name, CORBA::Long threshold_value, Callback_Quoter::Consumer_ptr consumer_handler) - ACE_THROW_SPEC ((CORBA::SystemException, - Callback_Quoter::Invalid_Stock)) { // Store the client information. Consumer_Data consumer_data; @@ -107,8 +105,6 @@ Notifier_i::orb (CORBA::ORB_ptr orb) void Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer) - ACE_THROW_SPEC ((CORBA::SystemException, - Callback_Quoter::Invalid_Handle)) { // The consumer_map consists of a map of stocknames with consumers // and their threshold values attached to it. To unregister a @@ -154,7 +150,6 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer) void Notifier_i::market_status (const char *stock_name, CORBA::Long stock_value) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Notifier_i:: The stockname is %s with price %d\n", @@ -202,7 +197,6 @@ Notifier_i::market_status (const char *stock_name, void Notifier_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if ( this->consumer_map_.close () > 0) ACE_ERROR ((LM_ERROR, diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h index db15a8de06f..51c6573664c 100644 --- a/TAO/examples/Callback_Quoter/Notifier_i.h +++ b/TAO/examples/Callback_Quoter/Notifier_i.h @@ -51,27 +51,21 @@ public: virtual void register_callback (const char *stock_name, CORBA::Long threshold_value, - Callback_Quoter::Consumer_ptr consumer_handler) - ACE_THROW_SPEC ((CORBA::SystemException, - Callback_Quoter::Invalid_Stock)); + Callback_Quoter::Consumer_ptr consumer_handler); // Register a distributed callback handler that is invoked when the // given stock reaches the desired threshold value. - virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler) - ACE_THROW_SPEC ((CORBA::SystemException, - Callback_Quoter::Invalid_Handle)); + virtual void unregister_callback (Callback_Quoter::Consumer_ptr consumer_handler); // Remove the consumer object. virtual void market_status (const char *stock_name, - CORBA::Long stock_value) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long stock_value); // Get the market status. void orb (CORBA::ORB_ptr orb); // Get the orb pointer. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the Notifier. // CONSUMER_MAP* get_consumer_map_ptr (); diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp index 55754368e9a..25839b2ea8e 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp @@ -27,7 +27,6 @@ Content_Iterator_i::~Content_Iterator_i (void) CORBA::Boolean Content_Iterator_i::next_chunk (CORBA::ULongLong offset, Web_Server::Chunk_Type_out chunk) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize/allocate the Chunk_Type sequence chunk = new Web_Server::Chunk_Type; @@ -106,7 +105,6 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset, void Content_Iterator_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { (void) this->file_io_.close (); diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h index 8fba05df706..c5f475d069b 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.h @@ -52,13 +52,11 @@ public: // Destructor virtual CORBA::Boolean next_chunk (CORBA::ULongLong offset, - Web_Server::Chunk_Type_out chunk) - ACE_THROW_SPEC ((CORBA::SystemException)); + Web_Server::Chunk_Type_out chunk); // This operation returns the next <chunk> of the file starting at // <offset>. If there are no more bindings, false is returned. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Destroy the iterator. private: diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp index 934865fbd92..05e196fc903 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.cpp @@ -19,7 +19,6 @@ void Iterator_Factory_i::get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata) - ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received request for file: <%s>\n"), diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h index 26cb3a8380d..dcf30076d82 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Factory_i.h @@ -45,9 +45,7 @@ public: virtual void get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, - Web_Server::Metadata_Type_out metadata) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)); + Web_Server::Metadata_Type_out metadata); // This factory method returns a <Content_Iterator> that can be used // to read the <contents> associated with <pathname> one ``chunk'' // at a time. The <metadata> reports information about the diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp index 4237416f0af..32e79cf6724 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.cpp @@ -36,7 +36,6 @@ Iterator_Handler::~Iterator_Handler (void) void Iterator_Handler::next_chunk (CORBA::Boolean pending_data, const Web_Server::Chunk_Type &chunk_data) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (pending_data) { @@ -79,7 +78,6 @@ Iterator_Handler::next_chunk (CORBA::Boolean pending_data, } void Iterator_Handler::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Deactivate this reply handler. this->deactivate (); @@ -90,8 +88,6 @@ void Iterator_Handler::run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)) { if (request_count != 0) this->request_count_ = request_count; @@ -114,8 +110,6 @@ void Iterator_Handler::initialize_content_iterator (const char *pathname, Web_Server::Iterator_Factory_ptr factory) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)) { // Obtain a Content Iterator for the desired file. factory->get_iterator (pathname, @@ -141,7 +135,6 @@ Iterator_Handler::initialize_content_iterator void Iterator_Handler::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the POA used when activating the Reply Handler object. PortableServer::POA_var poa = diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h index 9427fef211b..bc63b1361f8 100644 --- a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h @@ -53,25 +53,21 @@ public: // name of the file being retrieved from the web server. virtual void next_chunk (CORBA::Boolean pending_data, - const Web_Server::Chunk_Type & chunk) - ACE_THROW_SPEC ((CORBA::SystemException)); + const Web_Server::Chunk_Type & chunk); virtual void next_chunk_excep ( ::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) {} + {} - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void destroy_excep ( ::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) {} + {} void run (int *request_count, const char *pathname, - Web_Server::Iterator_Factory_ptr factory) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)); + Web_Server::Iterator_Factory_ptr factory); // Activate and run this Reply Handler. The contents (not the // pointer itself) of the <request_count> parameter will be // incremented when file retrieval begins, and decremented when file @@ -83,13 +79,10 @@ private: // on the heap). void initialize_content_iterator (const char *pathname, - Web_Server::Iterator_Factory_ptr factory) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)); + Web_Server::Iterator_Factory_ptr factory); // Initialize the Content Iterator used to retrieve the file. - void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void deactivate (void); // Deactivate this reply handler. int get_viewer (char *viewer, size_t length); diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp index 1fd4ed054b7..da88ca65b4f 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp @@ -29,7 +29,6 @@ Callback_Handler::~Callback_Handler (void) void Callback_Handler::next_chunk (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->last_chunk_ == 1) { @@ -84,7 +83,6 @@ Callback_Handler::next_chunk (void) void Callback_Handler::next_chunk_excep (::Messaging::ExceptionHolder *excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->last_chunk_ = 1; @@ -104,8 +102,6 @@ Callback_Handler::next_chunk_excep void Callback_Handler::run (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)) { // Open the file to be downloaded this->open_file (); @@ -121,8 +117,6 @@ Callback_Handler::run (void) void Callback_Handler::open_file (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)) { // Create a temporary file to store the retrieved data. ACE_FILE_Connector connector; @@ -139,7 +133,6 @@ Callback_Handler::open_file (void) void Callback_Handler::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Close the file that was sent to the client. (void) this->file_io_.close (); diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h index 79f7a7dba99..90f05d3e1e6 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.h @@ -77,16 +77,12 @@ public: // Constructor that creates a content iterator corresponding to the // name of the file being retrieved from the web server. - virtual void next_chunk (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void next_chunk (void); // The callback for this reply handler. - virtual void next_chunk_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void next_chunk_excep (::Messaging::ExceptionHolder *); - void run (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)); + void run (void); // Activate and run this Reply Handler. The contents (not the // pointer itself) of the <request_count> parameter will be // incremented when file retrieval begins, and decremented when file @@ -97,13 +93,10 @@ private: // Destructor (private to ensure that Callback_Handler is allocated // on the heap). - void open_file (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)); + void open_file (void); // Open the file to be uploaded to the client callback. - void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void deactivate (void); // Deactivate this reply handler. private: diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp index c2c60adbecf..778bc7d16a6 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.cpp @@ -52,7 +52,6 @@ Callback_i::~Callback_i (void) void Callback_i::next_chunk (const Web_Server::Chunk_Type & chunk_data, CORBA::Boolean last_chunk) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (!last_chunk) { diff --git a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h index 18690abce63..5105bd46689 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Callback_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Callback_i.h @@ -61,8 +61,7 @@ public: // Constructor virtual void next_chunk (const Web_Server::Chunk_Type &chunk, - CORBA::Boolean last_chunk) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean last_chunk); // This operation returns the next <chunk> of the file starting at // <offset>. If there are no more bindings, false is returned. diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp index 2b1fc2c0ee6..307a025fc74 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.cpp @@ -19,7 +19,6 @@ Web_Server::Metadata_Type * Push_Iterator_Factory_i::register_callback (const char *pathname, Web_Server::Callback_ptr client_callback) - ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { if (CORBA::is_nil (client_callback)) // @@ Will it ever be nil? throw CORBA::BAD_PARAM (); diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h index 7bf0c2dacc2..1ccd1880e53 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Factory_i.h @@ -53,9 +53,7 @@ class Push_Iterator_Factory_i : public: Web_Server::Metadata_Type *register_callback (const char *pathname, - Web_Server::Callback_ptr client_callback) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)); + Web_Server::Callback_ptr client_callback); // This registration method passes a <Callback> that the Web server // uses to ``push'' data associated with <pathname> one ``chunk'' at // a time. The <metadata> reports information about the <pathname>. diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp index 46c920b873d..85033aa0412 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.cpp @@ -26,7 +26,6 @@ Push_Iterator_Handler::~Push_Iterator_Handler (void) void Push_Iterator_Handler::register_callback (const Web_Server::Metadata_Type &metadata) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->callback_servant_->metadata (metadata); @@ -38,8 +37,6 @@ void Push_Iterator_Handler::run (int *request_count, const char *pathname, Web_Server::Iterator_Factory_ptr factory) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)) { ACE_NEW_THROW_EX (this->callback_servant_, Callback_i (request_count), @@ -64,7 +61,6 @@ Push_Iterator_Handler::run (int *request_count, void Push_Iterator_Handler::deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the POA used when activating the Reply Handler object. PortableServer::POA_var poa = this->_default_POA (); diff --git a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h index a884c218600..5e973a68824 100644 --- a/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h +++ b/TAO/examples/Content_Server/AMI_Observer/Push_Iterator_Handler.h @@ -62,9 +62,7 @@ public: void run (int *request_count, const char *pathname, - Web_Server::Iterator_Factory_ptr factory) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)); + Web_Server::Iterator_Factory_ptr factory); // Activate and run this Reply Handler. The contents (not the // pointer itself) of the <request_count> parameter will be // incremented when file retrieval begins, and decremented when file @@ -77,17 +75,15 @@ private: // on the heap). virtual void register_callback - (const Web_Server::Metadata_Type &metadata) - ACE_THROW_SPEC ((CORBA::SystemException)); + (const Web_Server::Metadata_Type &metadata); // AMI callback that is invoked when a response from the // corresponding server method is received. virtual void register_callback_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) {} + {} - void deactivate (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void deactivate (void); // Deactivate this handler. private: diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp index 3aef112e8d5..198305ac78b 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp @@ -28,7 +28,6 @@ Content_Iterator_i::~Content_Iterator_i (void) CORBA::Boolean Content_Iterator_i::next_chunk (CORBA::ULongLong offset, Web_Server::Chunk_Type_out chunk) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Initialize/allocate the Chunk_Type sequence Web_Server::Chunk_Type *tmp = 0; @@ -117,7 +116,6 @@ Content_Iterator_i::next_chunk (CORBA::ULongLong offset, void Content_Iterator_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { (void) this->file_io_.close (); diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h index 7d61b296a03..0f8579ff5bd 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.h @@ -52,13 +52,11 @@ public: // Destructor virtual CORBA::Boolean next_chunk (CORBA::ULongLong offset, - Web_Server::Chunk_Type_out chunk) - ACE_THROW_SPEC ((CORBA::SystemException)); + Web_Server::Chunk_Type_out chunk); // This operation returns the next <chunk> of the file starting at // <offset>. If there are no more bindings, false is returned. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Destroy the iterator. private: diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp index d43c37035ed..5020c75bd2c 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.cpp @@ -15,7 +15,6 @@ void Iterator_Factory_i::get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, Web_Server::Metadata_Type_out metadata) - ACE_THROW_SPEC ((CORBA::SystemException, Web_Server::Error_Result)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received request for file: <%s>\n"), diff --git a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h index e68a29079c7..7b7bfb5164f 100644 --- a/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h +++ b/TAO/examples/Content_Server/SMI_Iterator/Iterator_Factory_i.h @@ -47,9 +47,7 @@ public: virtual void get_iterator (const char *pathname, Web_Server::Content_Iterator_out contents, - Web_Server::Metadata_Type_out metadata) - ACE_THROW_SPEC ((CORBA::SystemException, - Web_Server::Error_Result)); + Web_Server::Metadata_Type_out metadata); // This factory method returns a <Content_Iterator> that can be used // to read the <contents> associated with <pathname> one ``chunk'' // at a time. The <metadata> reports information about the diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp index 50068489754..5eca63c879e 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.cpp +++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp @@ -161,10 +161,6 @@ The filtering criteria will not work.\n")); void Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref, const char *filtering_criteria) - ACE_THROW_SPEC (( - CORBA::SystemException, - Event_Comm::Notifier::CannotSubscribe - )) { ACE_DEBUG ((LM_DEBUG, "in Notifier_i::subscribe for %x with filtering criteria \"%s\"\n", @@ -224,10 +220,6 @@ Notifier_i::subscribe (Event_Comm::Consumer_ptr consumer_ref, void Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref, const char *filtering_criteria) - ACE_THROW_SPEC (( - CORBA::SystemException, - Event_Comm::Notifier::CannotUnsubscribe - )) { ACE_DEBUG ((LM_DEBUG, "in Notifier_i::unsubscribe for %x\n", @@ -281,7 +273,6 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref, void Notifier_i::disconnect (const char *reason) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "in Notifier_i::send_disconnect = %s\n", @@ -332,7 +323,6 @@ Notifier_i::disconnect (const char *reason) void Notifier_i::push (const Event_Comm::Event &event) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "in Notifier_i::send_notification = %s\n", @@ -410,7 +400,6 @@ Consumer_i::~Consumer_i (void) void Consumer_i::push (const Event_Comm::Event &event) - ACE_THROW_SPEC ((CORBA::SystemException)) { const char *tmpstr = event.tag_; @@ -424,7 +413,6 @@ Consumer_i::push (const Event_Comm::Event &event) void Consumer_i::disconnect (const char *reason) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "**** got disconnected due to %s\n", diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h index 61529ad22e6..1df87e6751e 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.h +++ b/TAO/examples/Event_Comm/Event_Comm_i.h @@ -61,12 +61,10 @@ public: void set_reactor (ACE_Reactor *reactor); // set the <ACE_Reactor> to use when quitting. - virtual void push (const Event_Comm::Event & event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const Event_Comm::Event & event); // Pass the <event> to the <Consumer>. - virtual void disconnect (const char * reason) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect (const char * reason); // Disconnect the <Consumer> from the <Notifier>, giving it the // <reason>. @@ -96,30 +94,20 @@ public: Notifier_i (size_t size_hint = Notifier_i::DEFAULT_SIZE); // Initialize a Notifier_i object with the specified size hint. - virtual void disconnect (const char *reason) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect (const char *reason); // Disconnect all the receivers, giving them the <reason>. - virtual void push (const Event_Comm::Event &event) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const Event_Comm::Event &event); // Send the <event> to all the consumers who have subscribed and who // match the filtering criteria. virtual void subscribe (Event_Comm::Consumer_ptr Consumer, - const char * filtering_criteria) - ACE_THROW_SPEC (( - CORBA::SystemException, - Event_Comm::Notifier::CannotSubscribe - )); + const char * filtering_criteria); // Subscribe the <Consumer> to receive events that match // <filtering_criteria> applied by the <Notifier>. void unsubscribe (Event_Comm::Consumer *consumer, - const char *filtering_criteria) - ACE_THROW_SPEC (( - CORBA::SystemException, - Event_Comm::Notifier::CannotUnsubscribe - )); + const char *filtering_criteria); // Unsubscribe the <Consumer>. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp index f8b9de0d5e2..5730aaacbf4 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp @@ -16,14 +16,12 @@ using namespace std; EDF_Scheduling::SchedulingParameter EDF_Sched_Param_Policy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } void EDF_Sched_Param_Policy::value (const EDF_Scheduling::SchedulingParameter& value) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->value_ = value; } @@ -92,7 +90,6 @@ EDF_Scheduler::shutdown (void) EDF_Scheduling::SchedulingParameterPolicy_ptr EDF_Scheduler::create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value) - ACE_THROW_SPEC ((CORBA::SystemException)) { /* MEASURE: Time to create scheduling parameter */ DSUI_EVENT_LOG (EDF_SCHED_FAM, CREATE_SCHED_PARAM, 0, 0, NULL); @@ -117,8 +114,6 @@ EDF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType const char *, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, @@ -158,8 +153,6 @@ EDF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT const char *name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { int int_guid; ACE_OS::memcpy (&int_guid, @@ -177,8 +170,6 @@ EDF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g const char* name, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { ACE_UNUSED_ARG ((name)); ACE_UNUSED_ARG ((implicit_sched_param)); @@ -208,7 +199,6 @@ EDF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g void EDF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid, const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { int int_guid; @@ -227,7 +217,6 @@ void EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { int int_guid; ACE_OS::memcpy (&int_guid, @@ -239,8 +228,6 @@ EDF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdTyp void EDF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { int int_guid; ACE_OS::memcpy (&int_guid, @@ -348,8 +335,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, CORBA::String_out /*name*/, CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param_out*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr; @@ -477,8 +462,6 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, void EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { int int_guid; ACE_OS::memcpy (&int_guid, @@ -489,7 +472,6 @@ EDF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) void EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { int int_guid; ACE_OS::memcpy (&int_guid, @@ -576,8 +558,6 @@ EDF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) void EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { int int_guid; ACE_OS::memcpy (&int_guid, @@ -590,8 +570,6 @@ EDF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) void EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { int int_guid; ACE_OS::memcpy (&int_guid, @@ -604,7 +582,6 @@ EDF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) void EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { int int_guid; @@ -679,8 +656,6 @@ EDF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) void EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_EXCEPTION, 0, 0, NULL); @@ -689,8 +664,6 @@ EDF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) void EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { DSUI_EVENT_LOG (EDF_SCHED_FAM, RECEIVE_OTHER, 0, 0, NULL); @@ -702,35 +675,30 @@ EDF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) void EDF_Scheduler::cancel (const RTScheduling::Current::IdType &) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::PolicyList* EDF_Scheduler::scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void EDF_Scheduler::scheduling_policies (const CORBA::PolicyList &) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::PolicyList* EDF_Scheduler::poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } char * EDF_Scheduler::scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -738,7 +706,6 @@ EDF_Scheduler::scheduling_discipline_name (void) RTScheduling::ResourceManager_ptr EDF_Scheduler::create_resource_manager (const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -747,7 +714,6 @@ void EDF_Scheduler::set_scheduling_parameter (PortableServer::Servant &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h index e1a7a27c903..77c52f15dc5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h @@ -51,11 +51,9 @@ public EDF_Scheduling::SchedulingParameterPolicy, { public: - EDF_Scheduling::SchedulingParameter value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + EDF_Scheduling::SchedulingParameter value (void); - void value (const EDF_Scheduling::SchedulingParameter & value) - ACE_THROW_SPEC ((CORBA::SystemException)); + void value (const EDF_Scheduling::SchedulingParameter & value); private: EDF_Scheduling::SchedulingParameter value_; @@ -77,102 +75,70 @@ public TAO_Local_RefCounted_Object virtual EDF_Scheduling::SchedulingParameterPolicy_ptr create_scheduling_parameter (const EDF_Scheduling::SchedulingParameter & value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void shutdown (void); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid, - const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * name); virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, - CORBA::Policy_ptr outer_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr outer_sched_param); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, RTScheduling::Current::IdType_out guid, CORBA::String_out name, CORBA::Policy_out sched_param, - CORBA::Policy_out implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + CORBA::Policy_out implicit_sched_param); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void cancel (const RTScheduling::Current::IdType & guid) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * scheduling_policies (void); - virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * poa_policies (void); - virtual char * scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * scheduling_discipline_name (void); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); virtual void set_scheduling_parameter (PortableServer::Servant & resource, const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); Kokyu::DSRT_Dispatcher_Factory<EDF_Scheduler_Traits>::DSRT_Dispatcher_Auto_Ptr kokyu_dispatcher_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp index 8624fdf23c7..13a67c98bc0 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp @@ -26,9 +26,6 @@ FP_Segment_Sched_Param_Policy::FP_Segment_Sched_Param_Policy ( FP_Scheduling::SegmentSchedulingParameter FP_Segment_Sched_Param_Policy::value ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return value_; } @@ -37,16 +34,12 @@ void FP_Segment_Sched_Param_Policy::value ( const FP_Scheduling::SegmentSchedulingParameter & value ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { this->value_ = value; } CORBA::Policy_ptr FP_Segment_Sched_Param_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { FP_Segment_Sched_Param_Policy* tmp; ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this), @@ -58,7 +51,6 @@ FP_Segment_Sched_Param_Policy::copy (void) void FP_Segment_Sched_Param_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -127,9 +119,6 @@ FP_Scheduling::SegmentSchedulingParameterPolicy_ptr Fixed_Priority_Scheduler::create_segment_scheduling_parameter ( const FP_Scheduling::SegmentSchedulingParameter & value ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { FP_Scheduling::SegmentSchedulingParameterPolicy_ptr segment_sched_param_policy; @@ -152,8 +141,6 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr const char *, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, @@ -188,8 +175,6 @@ Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::C const char *name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { this->begin_new_scheduling_segment (guid, name, @@ -202,8 +187,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current const char* name, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { ACE_UNUSED_ARG ((name)); ACE_UNUSED_ARG ((implicit_sched_param)); @@ -233,7 +216,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current void Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid, const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { #ifdef KOKYU_DSRT_LOGGING int int_guid; @@ -250,7 +232,6 @@ void Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -258,8 +239,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur void Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; @@ -350,8 +329,6 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf CORBA::String_out /*name*/, CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param_out*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr; @@ -434,14 +411,11 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf void Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTCORBA::Priority desired_priority = 0; Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; @@ -506,23 +480,18 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr void Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { send_reply (ri); } void Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { send_reply (ri); } void Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::Current::IdType guid; RTCORBA::Priority desired_priority=0; @@ -580,51 +549,42 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ void Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { receive_reply (ri); } void Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { receive_reply (ri); } void Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::PolicyList* Fixed_Priority_Scheduler::scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::PolicyList* Fixed_Priority_Scheduler::poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } char * Fixed_Priority_Scheduler::scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -632,7 +592,6 @@ Fixed_Priority_Scheduler::scheduling_discipline_name (void) RTScheduling::ResourceManager_ptr Fixed_Priority_Scheduler::create_resource_manager (const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -641,7 +600,6 @@ void Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h index 5d9a3d001c8..ea2f0dd541e 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.h @@ -46,23 +46,15 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy, FP_Segment_Sched_Param_Policy (const FP_Segment_Sched_Param_Policy &rhs); FP_Scheduling::SegmentSchedulingParameter value ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); void value ( const FP_Scheduling::SegmentSchedulingParameter & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); private: FP_Scheduling::SegmentSchedulingParameter value_; @@ -86,102 +78,68 @@ public TAO_Local_RefCounted_Object virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr create_segment_scheduling_parameter ( const FP_Scheduling::SegmentSchedulingParameter & value - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid, - const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * name); virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, - CORBA::Policy_ptr outer_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr outer_sched_param); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, RTScheduling::Current::IdType_out guid, CORBA::String_out name, CORBA::Policy_out sched_param, - CORBA::Policy_out implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + CORBA::Policy_out implicit_sched_param); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void cancel (const RTScheduling::Current::IdType & guid) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * scheduling_policies (void); - virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * poa_policies (void); - virtual char * scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * scheduling_discipline_name (void); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); virtual void set_scheduling_parameter (PortableServer::Servant & resource, const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp index 4d88d2fce9f..cf42475ac28 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp @@ -25,21 +25,18 @@ MIF_Sched_Param_Policy::MIF_Sched_Param_Policy ( MIF_Scheduling::SchedulingParameter MIF_Sched_Param_Policy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } void MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->value_ = value; } CORBA::Policy_ptr MIF_Sched_Param_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { MIF_Sched_Param_Policy* tmp = 0; ACE_NEW_THROW_EX (tmp, @@ -52,7 +49,6 @@ MIF_Sched_Param_Policy::copy (void) void MIF_Sched_Param_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -117,7 +113,6 @@ MIF_Scheduler::shutdown (void) MIF_Scheduling::SchedulingParameterPolicy_ptr MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value) - ACE_THROW_SPEC ((CORBA::SystemException)) { MIF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy; ACE_NEW_THROW_EX (sched_param_policy, @@ -139,8 +134,6 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType const char *, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, @@ -175,8 +168,6 @@ MIF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT const char *name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { this->begin_new_scheduling_segment (guid, name, @@ -189,8 +180,6 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g const char* name, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { ACE_UNUSED_ARG ((name)); ACE_UNUSED_ARG ((implicit_sched_param)); @@ -219,7 +208,6 @@ void MIF_Scheduler::end_scheduling_segment ( const RTScheduling::Current::IdType &guid, const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { #ifdef KOKYU_DSRT_LOGGING int int_guid; @@ -237,7 +225,6 @@ MIF_Scheduler::end_nested_scheduling_segment ( const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -245,8 +232,6 @@ MIF_Scheduler::end_nested_scheduling_segment ( void MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; @@ -336,8 +321,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, CORBA::String_out /*name*/, CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param_out*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr; @@ -419,7 +402,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, void MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Short importance = 0; Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; @@ -489,30 +471,23 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) void MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { send_reply (ri); } void MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { send_reply (ri); } void MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::Current::IdType guid; CORBA::Short importance=0; @@ -569,50 +544,41 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) void MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { receive_reply (ri); } void MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { receive_reply (ri); } void MIF_Scheduler::cancel (const RTScheduling::Current::IdType &) - ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyList* MIF_Scheduler::scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::PolicyList* MIF_Scheduler::poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } char * MIF_Scheduler::scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -620,7 +586,6 @@ MIF_Scheduler::scheduling_discipline_name (void) RTScheduling::ResourceManager_ptr MIF_Scheduler::create_resource_manager (const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -629,7 +594,6 @@ void MIF_Scheduler::set_scheduling_parameter (PortableServer::Servant &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h index 7803ce173f3..cf1829ccb50 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h @@ -45,17 +45,13 @@ public MIF_Scheduling::SchedulingParameterPolicy, MIF_Sched_Param_Policy (); MIF_Sched_Param_Policy (const MIF_Sched_Param_Policy &rhs); - MIF_Scheduling::SchedulingParameter value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + MIF_Scheduling::SchedulingParameter value (void); - void value (const MIF_Scheduling::SchedulingParameter & value) - ACE_THROW_SPEC ((CORBA::SystemException)); + void value (const MIF_Scheduling::SchedulingParameter & value); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); private: MIF_Scheduling::SchedulingParameter value_; @@ -77,102 +73,70 @@ public TAO_Local_RefCounted_Object virtual MIF_Scheduling::SchedulingParameterPolicy_ptr create_scheduling_parameter (const MIF_Scheduling::SchedulingParameter & value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void shutdown (void); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid, - const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * name); virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, - CORBA::Policy_ptr outer_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr outer_sched_param); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, RTScheduling::Current::IdType_out guid, CORBA::String_out name, CORBA::Policy_out sched_param, - CORBA::Policy_out implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + CORBA::Policy_out implicit_sched_param); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void cancel (const RTScheduling::Current::IdType & guid) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * scheduling_policies (void); - virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * poa_policies (void); - virtual char * scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * scheduling_discipline_name (void); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); virtual void set_scheduling_parameter (PortableServer::Servant & resource, const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp index ac1d00af137..a1a28cdcb81 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp @@ -25,21 +25,18 @@ MUF_Sched_Param_Policy::MUF_Sched_Param_Policy ( MUF_Scheduling::SchedulingParameter MUF_Sched_Param_Policy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } void MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->value_ = value; } CORBA::Policy_ptr MUF_Sched_Param_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { MUF_Sched_Param_Policy* tmp; ACE_NEW_THROW_EX (tmp, @@ -52,7 +49,6 @@ MUF_Sched_Param_Policy::copy (void) void MUF_Sched_Param_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -117,7 +113,6 @@ MUF_Scheduler::shutdown (void) MUF_Scheduling::SchedulingParameterPolicy_ptr MUF_Scheduler::create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value) - ACE_THROW_SPEC ((CORBA::SystemException)) { MUF_Scheduling::SchedulingParameterPolicy_ptr sched_param_policy; ACE_NEW_THROW_EX (sched_param_policy, @@ -139,8 +134,6 @@ MUF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType const char *, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { #ifdef KOKYU_DSRT_LOGGING ACE_DEBUG ((LM_DEBUG, @@ -179,8 +172,6 @@ MUF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT const char *name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { this->begin_new_scheduling_segment (guid, name, @@ -193,8 +184,6 @@ MUF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g const char* name, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { ACE_UNUSED_ARG ((name)); ACE_UNUSED_ARG ((implicit_sched_param)); @@ -223,7 +212,6 @@ MUF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType& g void MUF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid, const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { #ifdef KOKYU_DSRT_LOGGING int int_guid; @@ -240,15 +228,12 @@ void MUF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; @@ -350,8 +335,6 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, CORBA::String_out /*name*/, CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param_out*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { Kokyu::Svc_Ctxt_DSRT_QoS* sc_qos_ptr; @@ -446,14 +429,11 @@ MUF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, void MUF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { Kokyu::Svc_Ctxt_DSRT_QoS sc_qos; @@ -534,23 +514,18 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) void MUF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { send_reply (ri); } void MUF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { send_reply (ri); } void MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::Current::IdType guid; @@ -618,51 +593,42 @@ MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) void MUF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { receive_reply (ri); } void MUF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { receive_reply (ri); } void MUF_Scheduler::cancel (const RTScheduling::Current::IdType &) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::PolicyList* MUF_Scheduler::scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void MUF_Scheduler::scheduling_policies (const CORBA::PolicyList &) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } CORBA::PolicyList* MUF_Scheduler::poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } char * MUF_Scheduler::scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -670,7 +636,6 @@ MUF_Scheduler::scheduling_discipline_name (void) RTScheduling::ResourceManager_ptr MUF_Scheduler::create_resource_manager (const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } @@ -679,7 +644,6 @@ void MUF_Scheduler::set_scheduling_parameter (PortableServer::Servant &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h index 11b15ee9e91..e9b70810567 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h @@ -61,17 +61,13 @@ public MUF_Scheduling::SchedulingParameterPolicy, MUF_Sched_Param_Policy (); MUF_Sched_Param_Policy (const MUF_Sched_Param_Policy &rhs); - MUF_Scheduling::SchedulingParameter value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + MUF_Scheduling::SchedulingParameter value (void); - void value (const MUF_Scheduling::SchedulingParameter & value) - ACE_THROW_SPEC ((CORBA::SystemException)); + void value (const MUF_Scheduling::SchedulingParameter & value); - virtual CORBA::Policy_ptr copy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (); - virtual void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (); private: MUF_Scheduling::SchedulingParameter value_; @@ -93,102 +89,70 @@ public TAO_Local_RefCounted_Object virtual MUF_Scheduling::SchedulingParameterPolicy_ptr create_scheduling_parameter (const MUF_Scheduling::SchedulingParameter & value - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); void shutdown (void); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid, - const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * name); virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, - CORBA::Policy_ptr outer_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr outer_sched_param); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, RTScheduling::Current::IdType_out guid, CORBA::String_out name, CORBA::Policy_out sched_param, - CORBA::Policy_out implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + CORBA::Policy_out implicit_sched_param); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void cancel (const RTScheduling::Current::IdType & guid) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * scheduling_policies (void); - virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * poa_policies (void); - virtual char * scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * scheduling_discipline_name (void); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); virtual void set_scheduling_parameter (PortableServer::Servant & resource, const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp index a7bb67610a1..4cb98a72a1f 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.cpp @@ -15,7 +15,6 @@ ACE_RCSID(MT_Server, test_i, "$Id$") CORBA::Long Simple_Server_i::test_method (CORBA::Long exec_duration) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); @@ -122,7 +121,6 @@ Simple_Server_i::test_method (CORBA::Long exec_duration) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); this->orb_->shutdown (0); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h index 45c7c4449fc..c1fdefe2374 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/test_i.h @@ -36,11 +36,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp index 6ac6bf963e1..8573e0973ad 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.cpp @@ -15,7 +15,6 @@ ACE_RCSID(MT_Server, test_i, "$Id$") CORBA::Long Simple_Server_i::test_method (CORBA::Long exec_duration) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); @@ -122,7 +121,6 @@ Simple_Server_i::test_method (CORBA::Long exec_duration) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); this->orb_->shutdown (0); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h index 45c7c4449fc..c1fdefe2374 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/test_i.h @@ -36,11 +36,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp index 6ac6bf963e1..8573e0973ad 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.cpp @@ -15,7 +15,6 @@ ACE_RCSID(MT_Server, test_i, "$Id$") CORBA::Long Simple_Server_i::test_method (CORBA::Long exec_duration) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hthread_t thr_handle; ACE_Thread::self (thr_handle); @@ -122,7 +121,6 @@ Simple_Server_i::test_method (CORBA::Long exec_duration) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "shutdown request from client\n")); this->orb_->shutdown (0); diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h index 45c7c4449fc..c1fdefe2374 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/test_i.h @@ -36,11 +36,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Load_Balancing/Identity_i.cpp b/TAO/examples/Load_Balancing/Identity_i.cpp index 9cb33e89fe2..72ed692d4b4 100644 --- a/TAO/examples/Load_Balancing/Identity_i.cpp +++ b/TAO/examples/Load_Balancing/Identity_i.cpp @@ -26,7 +26,6 @@ Identity_i::~Identity_i (void) void Identity_i::get_name (CORBA::String_out name ) - ACE_THROW_SPEC ((CORBA::SystemException)) { name = this->name_.in (); } diff --git a/TAO/examples/Load_Balancing/Identity_i.h b/TAO/examples/Load_Balancing/Identity_i.h index 7a6abd8c61c..d6810cb9a7f 100644 --- a/TAO/examples/Load_Balancing/Identity_i.h +++ b/TAO/examples/Load_Balancing/Identity_i.h @@ -30,8 +30,7 @@ public: ~Identity_i (void); // Destructor. - virtual void get_name (CORBA::String_out name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void get_name (CORBA::String_out name); // Returns the name of this object. private: diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp index 9509b8c9a62..7211d5964e1 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp @@ -34,8 +34,6 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { return make_group (0, id); @@ -43,8 +41,6 @@ Object_Group_Factory_i::make_round_robin (const char * id) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_random (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { return make_group (1, id); @@ -53,8 +49,6 @@ Object_Group_Factory_i::make_random (const char * id) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { ACE_CString group_id (id); @@ -113,8 +107,6 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)) { ACE_CString group_id (id); Load_Balancer::Object_Group_var group; @@ -168,14 +160,12 @@ Object_Group_Factory_i::list_groups (int random) Load_Balancer::Group_List * Object_Group_Factory_i::round_robin_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return list_groups (0); } Load_Balancer::Group_List * Object_Group_Factory_i::random_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return list_groups (1); } @@ -201,15 +191,12 @@ Object_Group_i::~Object_Group_i (void) char * Object_Group_i::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (id_.c_str ()); } void Object_Group_i::bind (const Load_Balancer::Member & member) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_member)) { ACE_CString member_id (member.id); CORBA::Object_var obj = CORBA::Object::_duplicate (member.obj.in ()); @@ -241,8 +228,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member) void Object_Group_i::unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { ACE_CString member_id (id); @@ -270,8 +255,6 @@ Object_Group_i::unbind (const char * id) CORBA::Object_ptr Object_Group_i::resolve_with_id (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { CORBA::Object_var obj; ACE_CString member_id (id); @@ -284,7 +267,6 @@ Object_Group_i::resolve_with_id (const char * id) Load_Balancer::Member_ID_List * Object_Group_i::members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Load_Balancer::Member_ID_List * list; @@ -312,7 +294,6 @@ Object_Group_i::members (void) void Object_Group_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Deregister with POA. PortableServer::POA_var poa = @@ -342,7 +323,6 @@ Random_Object_Group::~Random_Object_Group (void) void Random_Object_Group::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { //Deregisters this <Object_Group> with its // <Object_Group_Factory>. @@ -353,8 +333,6 @@ Random_Object_Group::destroy (void) CORBA::Object_ptr Random_Object_Group::resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { CORBA::Object_var obj; @@ -391,7 +369,6 @@ RR_Object_Group::~RR_Object_Group (void) void RR_Object_Group::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { //Deregisters this <Object_Group> with its // <Object_Group_Factory>. @@ -402,8 +379,6 @@ RR_Object_Group::destroy (void) CORBA::Object_ptr RR_Object_Group::resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { CORBA::Object_var obj; @@ -431,8 +406,6 @@ RR_Object_Group::resolve (void) void RR_Object_Group::unbind (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { ACE_CString member_id (id); diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index 923216e992e..79b9c8d73a9 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -53,40 +53,32 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. - Load_Balancer::Object_Group_ptr make_round_robin (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + Load_Balancer::Object_Group_ptr make_round_robin (const char * id); // Creates an <Object_Group> that resolves requests for arbitrary // members in round robin order. If an <Object_Group>, of any // type, with Group_ID <id> has already been created by this // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - Load_Balancer::Object_Group_ptr make_random (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + Load_Balancer::Object_Group_ptr make_random (const char * id); // Creates an <Object_Group> that resolves requests for arbitrary // members in random order. If an <Object_Group>, of any // type, with Group_ID <id> has already been created by this // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - Load_Balancer::Object_Group_ptr resolve (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)); + Load_Balancer::Object_Group_ptr resolve (const char * id); // Locates and returns an <Object_Group> by its <Group_ID>. If // no <Object_Group> has <Group_ID> of <id>, throw a // <no_such_group> exception. - Load_Balancer::Group_List * round_robin_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Group_List * round_robin_groups (void); // Lists all the round robin <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of <Group_ID>s of all existing round robin // <Object_Group>s created by this factory. - Load_Balancer::Group_List * random_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Group_List * random_groups (void); // Lists all the random <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of <Group_ID>s of all existing random @@ -107,9 +99,7 @@ private: // = Helper methods. Load_Balancer::Object_Group_ptr make_group (int random, - const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + const char * id); // This function factors out common code in <make_round_robin> and // <make_random>. Creates a random <Object_Group> if <random> parameter is // set to 1 and round robin <Object_Group> if it is 0. @@ -159,46 +149,36 @@ public: // = Load_Balancer::Object_Group idl methods. - char * id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char * id (void); // Get group's id. - void bind (const Load_Balancer::Member & member) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_member)); + void bind (const Load_Balancer::Member & member); // Adds a new <member> to the <Object_Group>. Note that each // <Member_ID> in an <Object_Group> must be unique. If the // group already contains a member with the same <Member_ID>, a // <duplicate_member> exceptions is thrown. - void unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + void unbind (const char * id); // Removes a member with the specified <Member_ID> from the // <Object_Group>. If none of the group's members have a // Member_ID of <id>, <no_such_member> exception is thrown. CORBA::Object_ptr resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) = 0; + = 0; // Returns a member object from this <Object_Group> in accordance with // load balancing policy it implements, i.e., ``random'' or // ``round robin.'' If the group contains no members, <no_such_member> // exception is thrown. - CORBA::Object_ptr resolve_with_id (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + CORBA::Object_ptr resolve_with_id (const char * id); // Returns an object with the specified <Member_ID>. If this // <Object_Group> contains no members with the specified // <Member_ID>, <no_such_member> exception is thrown. - Load_Balancer::Member_ID_List * members (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Member_ID_List * members (void); // Return a sequence of <Member_ID>s of all of its members. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its // <id> should become available. <Object_Group_Factory> @@ -251,14 +231,11 @@ public: ~Random_Object_Group (void); // Destructor. - CORBA::Object_ptr resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + CORBA::Object_ptr resolve (void); // Returns a member object from this <Object_Group> in accordance with // the "random" load balancing policy. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its // <id> should become available. <Object_Group_Factory> @@ -280,21 +257,16 @@ public: ~RR_Object_Group (void); // Destructor. - void unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + void unbind (const char * id); // We need to override the implementation of <unbind> from // Object_Group_i to make sure <resolve> // works correctly. - CORBA::Object_ptr resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + CORBA::Object_ptr resolve (void); // Returns a member object from this <Object_Group> in accordance with // the "round robin" load balancing policy. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its // <id> should become available. <Object_Group_Factory> diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp index efa5f20eedf..c71e4c8f293 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.cpp @@ -27,14 +27,12 @@ Identity_i::~Identity_i (void) void Identity_i::get_name (CORBA::String_out name) - ACE_THROW_SPEC ((CORBA::SystemException)) { name = this->name_.in (); } PortableServer::POA_ptr Identity_i::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/examples/Load_Balancing_persistent/Identity_i.h b/TAO/examples/Load_Balancing_persistent/Identity_i.h index b06b626b78a..100750ee4e8 100644 --- a/TAO/examples/Load_Balancing_persistent/Identity_i.h +++ b/TAO/examples/Load_Balancing_persistent/Identity_i.h @@ -31,12 +31,10 @@ public: ~Identity_i (void); // Destructor. - virtual void get_name (CORBA::String_out name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void get_name (CORBA::String_out name); // Returns the name of this object. - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr _default_POA (void); // Method for the POA that will return the persistent POA_ptr stored // in here.. diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 03c11879840..07f96faaa63 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -40,7 +40,6 @@ Object_Group_Factory_i::~Object_Group_Factory_i (void) PortableServer::POA_ptr Object_Group_Factory_i::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -48,8 +47,6 @@ Object_Group_Factory_i::_default_POA (void) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_round_robin (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { if (this->mem_pool_->find (rr_name_bind, @@ -76,8 +73,6 @@ Object_Group_Factory_i::make_round_robin (const char * id) void Object_Group_Factory_i::unbind_round_robin (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)) { if (this->rr_groups_ == 0) { @@ -116,8 +111,6 @@ Object_Group_Factory_i::unbind_round_robin (const char * id) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_random (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { if (this->mem_pool_->find (random_name_bind, (void * &)this->random_groups_) == -1) @@ -145,8 +138,6 @@ Object_Group_Factory_i::make_random (const char * id) void Object_Group_Factory_i::unbind_random (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)) { if (this->random_groups_ == 0) { @@ -185,8 +176,6 @@ Object_Group_Factory_i::unbind_random (const char * id) Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)) { // Store our result here for return. Load_Balancer::Object_Group_var group; @@ -289,8 +278,6 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr Object_Group_Factory_i::resolve (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)) { @@ -416,14 +403,12 @@ Object_Group_Factory_i::list_groups (int random) Load_Balancer::Group_List * Object_Group_Factory_i::round_robin_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return list_groups (0); } Load_Balancer::Group_List * Object_Group_Factory_i::random_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return list_groups (1); } @@ -553,7 +538,6 @@ Object_Group_i::~Object_Group_i (void) PortableServer::POA_ptr Object_Group_i::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -561,15 +545,12 @@ Object_Group_i::_default_POA (void) char * Object_Group_i::id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (id_.c_str ()); } void Object_Group_i::bind (const Load_Balancer::Member & member) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_member)) { if (this->members_ == 0) @@ -662,8 +643,6 @@ Object_Group_i::bind (const Load_Balancer::Member & member) void Object_Group_i::unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { // Check whether the this->member_ is NULL if (this->members_ == 0) @@ -713,8 +692,6 @@ Object_Group_i::unbind (const char * id) char * Object_Group_i::resolve_with_id (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { CORBA::String_var ior; @@ -731,7 +708,6 @@ Object_Group_i::resolve_with_id (const char * id) Load_Balancer::Member_ID_List * Object_Group_i::members (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Load_Balancer::Member_ID_List * list = 0; @@ -763,7 +739,6 @@ Object_Group_i::members (void) void Object_Group_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Deregister with POA. PortableServer::POA_var poa = @@ -820,8 +795,6 @@ Random_Object_Group::Random_Object_Group (const char *id, char * Random_Object_Group::resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { this->read_from_memory (); @@ -858,8 +831,6 @@ RR_Object_Group::RR_Object_Group (const char *id, char * RR_Object_Group::resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { char *objref = 0; @@ -892,8 +863,6 @@ RR_Object_Group::resolve (void) void RR_Object_Group::unbind (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) { if (this->members_ == 0) diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index fd0ab4097dd..408ca548e00 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -61,56 +61,43 @@ public: // Destructor. - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr _default_POA (void); // Method for the POA that will return the persistent POA_ptr stored // in here.. // = Load_Balancer::Object_Group_Factory idl methods. - Load_Balancer::Object_Group_ptr make_round_robin (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + Load_Balancer::Object_Group_ptr make_round_robin (const char * id); // Creates an <Object_Group> that resolves requests for arbitrary // members in round robin order. If an <Object_Group>, of any // type, with Group_ID <id> has already been created by this // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - void unbind_round_robin (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)); + void unbind_round_robin (const char *id); - Load_Balancer::Object_Group_ptr make_random (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + Load_Balancer::Object_Group_ptr make_random (const char * id); // Creates an <Object_Group> that resolves requests for arbitrary // members in random order. If an <Object_Group>, of any // type, with Group_ID <id> has already been created by this // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - void unbind_random (const char *id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)); + void unbind_random (const char *id); - Load_Balancer::Object_Group_ptr resolve (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_group)); + Load_Balancer::Object_Group_ptr resolve (const char * id); // Locates and returns an <Object_Group IOR> by its <Group_ID>. If // no <Object_Group> has <Group_ID> of <id>, throw a // <no_such_group> exception. - Load_Balancer::Group_List * round_robin_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Group_List * round_robin_groups (void); // Lists all the round robin <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of <Group_ID>s of all existing round robin // <Object_Group>s created by this factory. - Load_Balancer::Group_List * random_groups (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Group_List * random_groups (void); // Lists all the random <Object_Group>s which were created // by this factory, and haven't been destroyed yet, i.e., return // a sequence of <Group_ID>s of all existing random @@ -127,9 +114,7 @@ private: // = Helper methods. Load_Balancer::Object_Group_ptr make_group (int random, - const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_group)); + const char * id); // This function factors out common code in <make_round_robin> and // <make_random>. Creates a random <Object_Group> if <random> parameter is // set to 1 and round robin <Object_Group> if it is 0. @@ -198,51 +183,40 @@ public: // Persistent POA // Method for the POA - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr _default_POA (void); // = Load_Balancer::Object_Group idl methods. - char * id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + char * id (void); // Get group's id. - void bind (const Load_Balancer::Member & member) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::duplicate_member)); + void bind (const Load_Balancer::Member & member); // Adds a new <member> to the <Object_Group>. Note that each // <Member_ID> in an <Object_Group> must be unique. If the // group already contains a member with the same <Member_ID>, a // <duplicate_member> exceptions is thrown. - void unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + void unbind (const char * id); // Removes a member with the specified <Member_ID> from the // <Object_Group>. If none of the group's members have a // Member_ID of <id>, <no_such_member> exception is thrown. char * resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)) = 0; + = 0; // Returns a member object from this <Object_Group> in accordance with // load balancing policy it implements, i.e., ``random'' or // ``round robin.'' If the group contains no members, <no_such_member> // exception is thrown. - char * resolve_with_id (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + char * resolve_with_id (const char * id); // Returns an object with the specified <Member_ID>. If this // <Object_Group> contains no members with the specified // <Member_ID>, <no_such_member> exception is thrown. - Load_Balancer::Member_ID_List * members (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Load_Balancer::Member_ID_List * members (void); // Return a sequence of <Member_ID>s of all of its members. - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); // Cleanup the resources associated with this <Object_Group>. // Subsequent calls to this <Object_Group> should fail, and its // <id> should become available. <Object_Group_Factory> @@ -293,9 +267,7 @@ public: PortableServer::POA_ptr poa); // Constructor. - char * resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + char * resolve (void); // Returns a member object from this <Object_Group> in accordance with // the "random" load balancing policy. @@ -313,16 +285,12 @@ public: PortableServer::POA_ptr poa); // Constructor. - void unbind (const char * id) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + void unbind (const char * id); // We need to override the implementation of <unbind> from // Object_Group_i to make sure <resolve> // works correctly. - char * resolve (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Load_Balancer::no_such_member)); + char * resolve (void); // Returns a member object from this <Object_Group> in accordance with // the "round robin" load balancing policy. diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp index b852854e2f7..58d9e384606 100644 --- a/TAO/examples/Logging/Logger_i.cpp +++ b/TAO/examples/Logging/Logger_i.cpp @@ -20,7 +20,6 @@ Logger_Factory_i::~Logger_Factory_i (void) Logger_ptr Logger_Factory_i::make_logger (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { Logger_i *result; // If name is already in the map, <find> will assign <result> to the @@ -109,14 +108,12 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level) void Logger_i::log (const Logger::Log_Record &log_rec) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity_level_); } void Logger_i::log_twoway (const Logger::Log_Record &log_rec) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity_level_); } @@ -124,7 +121,6 @@ Logger_i::log_twoway (const Logger::Log_Record &log_rec) void Logger_i::logv_twoway (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->logv (log_rec, verbosity); } @@ -132,7 +128,6 @@ Logger_i::logv_twoway (const Logger::Log_Record &log_rec, void Logger_i::logv (const Logger::Log_Record &log_rec, Logger::Verbosity_Level verbosity) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Create an <ACE_Log_Record> to leverage existing logging // code. Since Logger::Log_Priority enum tags don't cleanly map to @@ -180,7 +175,6 @@ Logger_i::logv (const Logger::Log_Record &log_rec, void Logger_i::verbosity (Logger::Verbosity_Level level) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->verbosity_level_ = level; } diff --git a/TAO/examples/Logging/Logger_i.h b/TAO/examples/Logging/Logger_i.h index cfc4ed15cac..d5a5a36cc5e 100644 --- a/TAO/examples/Logging/Logger_i.h +++ b/TAO/examples/Logging/Logger_i.h @@ -36,28 +36,23 @@ public: virtual ~Logger_i (void); // destructor - virtual void log (const Logger::Log_Record &log_rec) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void log (const Logger::Log_Record &log_rec); // Writes the <log_rec> to the standard output. virtual void logv (const Logger::Log_Record &log_rec, - Logger::Verbosity_Level verbosity) - ACE_THROW_SPEC ((CORBA::SystemException)); + Logger::Verbosity_Level verbosity); // Writes the <log_rec> to the standard output with the given // verbosity level - virtual void log_twoway (const Logger::Log_Record &log_rec) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void log_twoway (const Logger::Log_Record &log_rec); // Writes the <log_rec> to the standard output. virtual void logv_twoway (const Logger::Log_Record &log_rec, - Logger::Verbosity_Level verbosity) - ACE_THROW_SPEC ((CORBA::SystemException)); + Logger::Verbosity_Level verbosity); // Writes the <log_rec> to the standard output with the given // verbosity level - void verbosity (Logger::Verbosity_Level level) - ACE_THROW_SPEC ((CORBA::SystemException)); + void verbosity (Logger::Verbosity_Level level); // Sets the verbosity level. Valid values are {VERBOSE, VERBOSE_LITE // and SILENT}. Defaults to VERBOSE @@ -90,8 +85,7 @@ public: ~Logger_Factory_i (void); // Destructor. - virtual Logger_ptr make_logger (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Logger_ptr make_logger (const char *name); // This function returns a logger with name <name>. If <name> is // unique, a new logger is created; else, a previously created // logger of name <name> is returned diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp index 9ed260294f0..9c937c513ff 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.cpp +++ b/TAO/examples/OBV/Typed_Events/Server_i.cpp @@ -104,7 +104,6 @@ Checkpoint_i::orb (CORBA::ORB_ptr o) void Checkpoint_i::put_event (Event *event) - ACE_THROW_SPEC ((CORBA::SystemException)) { // In general this function would be a dispatcher which looks at the // origin id and finds an event handler object for the event. The @@ -134,7 +133,6 @@ Checkpoint_i::put_event (Event *event) Event_List * Checkpoint_i::get_critical_events (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The skeleton should not steal our list by decrementing // the reference counter. @@ -151,7 +149,6 @@ Checkpoint_i::get_critical_events (void) void Checkpoint_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "\n%s\n", diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h index bd1259e9c5f..8341c26165e 100644 --- a/TAO/examples/OBV/Typed_Events/Server_i.h +++ b/TAO/examples/OBV/Typed_Events/Server_i.h @@ -37,15 +37,12 @@ public: virtual void put_event ( Event * e - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual Event_List * get_critical_events ( - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the server. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index 8ef9b338672..503e5550e8e 100644 --- a/TAO/examples/POA/Adapter_Activator/server.cpp +++ b/TAO/examples/POA/Adapter_Activator/server.cpp @@ -60,8 +60,7 @@ public: CORBA::ORB_ptr orb); CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, - const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name); CORBA::PolicyList first_poa_policies_; CORBA::PolicyList second_poa_policies_; @@ -82,7 +81,6 @@ Adapter_Activator::Adapter_Activator (PortableServer::POAManager_ptr poa_manager CORBA::Boolean Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (ACE_OS::strcmp (name, "firstPOA") == 0) { diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp index 53c0095e5d1..99a97076236 100644 --- a/TAO/examples/POA/DSI/Database_i.cpp +++ b/TAO/examples/POA/DSI/Database_i.cpp @@ -136,9 +136,6 @@ Database::Entry_ptr DatabaseImpl::Agent::create_entry (const char *key, const char *entry_type, const Database::NVPairSequence &initial_attributes) - ACE_THROW_SPEC ((CORBA::SystemException, - Database::Unknown_Type, - Database::Duplicate_Key)) { // Create a new entry in the database: if (ACE_OS::strcmp (entry_type, "Employee") != 0 @@ -197,9 +194,6 @@ DatabaseImpl::Agent::create_entry (const char *key, Database::Entry_ptr DatabaseImpl::Agent::find_entry (const char *key, const char *entry_type) - ACE_THROW_SPEC ((CORBA::SystemException, - Database::Unknown_Type, - Database::Not_Found)) { if (ACE_OS::strcmp (entry_type, "Employee") != 0) @@ -245,9 +239,6 @@ DatabaseImpl::Agent::find_entry (const char *key, void DatabaseImpl::Agent::destroy_entry (const char *key, const char *entry_type) - ACE_THROW_SPEC ((CORBA::SystemException, - Database::Unknown_Type, - Database::Unknown_Key)) { if (ACE_OS::strcmp (entry_type, "Employee") != 0) throw Database::Unknown_Type (); @@ -278,7 +269,6 @@ DatabaseImpl::Agent::destroy_entry (const char *key, void DatabaseImpl::Agent::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } @@ -327,14 +317,12 @@ DatabaseImpl::Employee::~Employee (void) const char * DatabaseImpl::Employee::name (void) const - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->name_; } void DatabaseImpl::Employee::name (const char* name) - ACE_THROW_SPEC ((CORBA::SystemException)) { DATABASE::instance ()->free (this->name_); @@ -347,14 +335,12 @@ DatabaseImpl::Employee::name (const char* name) CORBA::Long DatabaseImpl::Employee::id (void) const - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->id_; } void DatabaseImpl::Employee::id (CORBA::Long id) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->id_ = id; } diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h index e29d77dc6ec..dde6908f8ff 100644 --- a/TAO/examples/POA/DSI/Database_i.h +++ b/TAO/examples/POA/DSI/Database_i.h @@ -75,25 +75,15 @@ public: virtual Database::Entry_ptr create_entry (const char *key, const char *entry_type, - const Database::NVPairSequence &initial_attributes) - ACE_THROW_SPEC ((CORBA::SystemException, - Database::Unknown_Type, - Database::Duplicate_Key)); + const Database::NVPairSequence &initial_attributes); virtual Database::Entry_ptr find_entry (const char *key, - const char *entry_type) - ACE_THROW_SPEC ((CORBA::SystemException, - Database::Unknown_Type, - Database::Not_Found)); + const char *entry_type); virtual void destroy_entry (const char *key, - const char *entry_type) - ACE_THROW_SPEC ((CORBA::SystemException, - Database::Unknown_Type, - Database::Unknown_Key)); + const char *entry_type); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); virtual PortableServer::POA_ptr _default_POA (void); // Returns the default POA for this servant. @@ -118,15 +108,11 @@ public: ~Employee (void); - const char *name (void) const - ACE_THROW_SPEC ((CORBA::SystemException)); - void name (const char* name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *name (void) const; + void name (const char* name); - CORBA::Long id (void) const - ACE_THROW_SPEC ((CORBA::SystemException)); - void id (CORBA::Long id) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long id (void) const; + void id (CORBA::Long id); void *operator new (size_t); void operator delete (void *pointer); diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp index 2ee888fd647..92b1ad8865c 100644 --- a/TAO/examples/POA/Default_Servant/File_i.cpp +++ b/TAO/examples/POA/Default_Servant/File_i.cpp @@ -45,8 +45,6 @@ FileImpl::System::_default_POA (void) File::Descriptor_ptr FileImpl::System::open (const char *file_name, CORBA::Long flags) - ACE_THROW_SPEC ((CORBA::SystemException, - File::IOError)) { // Do an ACE_OS::open ACE_HANDLE file_descriptor = ACE_OS::open (file_name, @@ -152,8 +150,6 @@ FileImpl::Descriptor::fd (void) CORBA::Long FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer) - ACE_THROW_SPEC ((CORBA::SystemException, - File::IOError)) { ACE_HANDLE file_descriptor = this->fd (); @@ -170,8 +166,6 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer) File::Descriptor::DataBuffer * FileImpl::Descriptor::read (CORBA::Long num_bytes) - ACE_THROW_SPEC ((CORBA::SystemException, - File::IOError)) { ACE_HANDLE file_descriptor = this->fd (); @@ -191,8 +185,6 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes) CORBA::ULong FileImpl::Descriptor::lseek (CORBA::ULong offset, CORBA::Long whence) - ACE_THROW_SPEC ((CORBA::SystemException, - File::IOError)) { ACE_HANDLE file_descriptor = this->fd (); @@ -207,7 +199,6 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, void FileImpl::Descriptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ACE_HANDLE for this object reference ACE_HANDLE file_descriptor = this->fd (); diff --git a/TAO/examples/POA/Default_Servant/File_i.h b/TAO/examples/POA/Default_Servant/File_i.h index 1a6ba088622..3b4858c1c18 100644 --- a/TAO/examples/POA/Default_Servant/File_i.h +++ b/TAO/examples/POA/Default_Servant/File_i.h @@ -37,24 +37,16 @@ public: PortableServer::POA_ptr _default_POA (void); // Returns the default POA of this object - virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer) - ACE_THROW_SPEC ((CORBA::SystemException, - File::IOError)); + virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer); // write buffer to File corresponding to this Descriptor - virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes) - ACE_THROW_SPEC ((CORBA::SystemException, - // Reads num_bytes from the file and returns it - File::IOError)); + virtual File::Descriptor::DataBuffer *read (CORBA::Long num_bytes); virtual CORBA::ULong lseek (CORBA::ULong offset, - CORBA::Long whence) - ACE_THROW_SPEC ((CORBA::SystemException, - File::IOError)); + CORBA::Long whence); // seek to the offset in file from whence - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // closes the file corresponding to the requested ObjectID private: @@ -81,9 +73,7 @@ public: //Returns the default POA of this object File::Descriptor_ptr open (const char *file_name, - CORBA::Long flags) - ACE_THROW_SPEC ((CORBA::SystemException, - File::IOError)); + CORBA::Long flags); // Opens a file ,creates a Descriptor reference with the // ACE_HANDLE and returns that reference diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.cpp b/TAO/examples/POA/Forwarding/Servant_Activator.cpp index 891aff8e682..49f4d0825bd 100644 --- a/TAO/examples/POA/Forwarding/Servant_Activator.cpp +++ b/TAO/examples/POA/Forwarding/Servant_Activator.cpp @@ -15,8 +15,6 @@ ACE_RCSID(Forwarding, Servant_Activator, "$Id$") PortableServer::Servant ServantActivator::incarnate (const PortableServer::ObjectId &, PortableServer::POA_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { this->orb_->shutdown (0); @@ -30,7 +28,6 @@ ServantActivator::etherealize (const PortableServer::ObjectId &, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean) - ACE_THROW_SPEC ((CORBA::SystemException)) { delete servant; } diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h index eda11fdaefc..081a137a852 100644 --- a/TAO/examples/POA/Forwarding/Servant_Activator.h +++ b/TAO/examples/POA/Forwarding/Servant_Activator.h @@ -39,16 +39,13 @@ public: CORBA::Object_ptr forward_to); virtual PortableServer::Servant incarnate (const PortableServer::ObjectId & oid, - PortableServer::POA_ptr adapter) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::POA_ptr adapter); virtual void etherealize (const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean remaining_activations); void forward_requests (void); // Object should be forwarded from now on. diff --git a/TAO/examples/POA/Forwarding/test_i.cpp b/TAO/examples/POA/Forwarding/test_i.cpp index e5b253f86ab..b973b929ffc 100644 --- a/TAO/examples/POA/Forwarding/test_i.cpp +++ b/TAO/examples/POA/Forwarding/test_i.cpp @@ -19,15 +19,12 @@ test_i::test_i (CORBA::ORB_ptr orb, CORBA::Long test_i::doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_++; } void test_i::forward (void) - ACE_THROW_SPEC ((CORBA::SystemException, - test::Cannot_Forward)) { this->activator_.forward_requests (); @@ -40,7 +37,6 @@ test_i::forward (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/examples/POA/Forwarding/test_i.h b/TAO/examples/POA/Forwarding/test_i.h index b72e64413e6..023e60b962a 100644 --- a/TAO/examples/POA/Forwarding/test_i.h +++ b/TAO/examples/POA/Forwarding/test_i.h @@ -25,16 +25,12 @@ public: ServantActivator &activator, CORBA::Long value); - virtual CORBA::Long doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long doit (void); // Setup forwarding - virtual void forward (void) - ACE_THROW_SPEC ((CORBA::SystemException, - test::Cannot_Forward)); + virtual void forward (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); virtual PortableServer::POA_ptr _default_POA (void); // Returns the default POA for this servant. diff --git a/TAO/examples/POA/Generic_Servant/test_i.cpp b/TAO/examples/POA/Generic_Servant/test_i.cpp index d43196aea2a..787cbbd889e 100644 --- a/TAO/examples/POA/Generic_Servant/test_i.cpp +++ b/TAO/examples/POA/Generic_Servant/test_i.cpp @@ -22,13 +22,11 @@ test_i::_default_POA (void) void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void test_i::oneway_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -50,7 +48,6 @@ test_i::sleep (CORBA::ULong timeout, void test_i::timed_method (CORBA::ULong timeout) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->sleep (timeout, "test_i::timed_method"); @@ -58,7 +55,6 @@ test_i::timed_method (CORBA::ULong timeout) void test_i::timed_oneway_method (CORBA::ULong timeout) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->sleep (timeout, "test_i::timed_oneway_method"); @@ -66,7 +62,6 @@ test_i::timed_oneway_method (CORBA::ULong timeout) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/examples/POA/Generic_Servant/test_i.h b/TAO/examples/POA/Generic_Servant/test_i.h index 6c0ff86e610..24094760497 100644 --- a/TAO/examples/POA/Generic_Servant/test_i.h +++ b/TAO/examples/POA/Generic_Servant/test_i.h @@ -25,24 +25,19 @@ public: PortableServer::POA_ptr _default_POA (void); // Returns the Default POA of this servant - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); // A twoway operation. - void oneway_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void oneway_method (void); // A oneway operation. - void timed_method (CORBA::ULong timeout) - ACE_THROW_SPEC ((CORBA::SystemException)); + void timed_method (CORBA::ULong timeout); // A timed twoway operation. - void timed_oneway_method (CORBA::ULong timeout) - ACE_THROW_SPEC ((CORBA::SystemException)); + void timed_oneway_method (CORBA::ULong timeout); // A timed twoway operation. - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); // Shutdown the ORB void sleep (CORBA::ULong timeout, diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index feb09fc5c5a..5bcaf80b63e 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -65,8 +65,6 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb, PortableServer::Servant ServantActivator::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { // Obtain the servant else exception. PortableServer::Servant servant = @@ -88,7 +86,6 @@ ServantActivator::etherealize (const PortableServer::ObjectId &oid, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated // with test servant, deactivate it by calling the diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h index a0a3ec2e174..77df93604ba 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.h +++ b/TAO/examples/POA/Loader/Servant_Activator.h @@ -64,9 +64,7 @@ public: // Initialization. virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::POA_ptr poa); // This method is invoked by a POA with USE_SERVANT_MANAGER and // RETAIN policies, whenever it receives a request for a // test object that is not currently active. When an servant @@ -81,8 +79,7 @@ public: PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean remaining_activations); // This method is invoked whenever a test object is // deactivated. This occurs when the POA is destroyed or the Object // is deactivated. When the POA is getting destroyed, it needs to diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index 2b3644104b2..461870a85dd 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -70,8 +70,6 @@ ServantLocator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { PortableServer::Servant servant = (*servant_supplier_) (oid, @@ -99,7 +97,6 @@ ServantLocator::postinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. PortableServer::Servant my_servant = diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h index eeedf1fb6c1..06396147ff5 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.h +++ b/TAO/examples/POA/Loader/Servant_Locator.h @@ -69,9 +69,7 @@ public: virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, - PortableServer::ServantLocator::Cookie &the_cookie) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::ServantLocator::Cookie &the_cookie); // This method is invoked by a POA whenever it receives a request // for test object that is not currently active. When the POA is // created using the NON_RETAIN policy the Active Object Map is not @@ -86,8 +84,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, - PortableServer::Servant the_servant) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::Servant the_servant); // This method is invoked whenever a test servant completes a // request. As the Servant Loactor interface is used when the POA // doesnt maintain the Active Object Map, its necessary to get rid diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp index 034c49d82aa..7b20091b85f 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp @@ -33,8 +33,6 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb) PortableServer::Servant ServantActivator::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { // Convert ObjectId to String. @@ -58,7 +56,6 @@ ServantActivator::etherealize (const PortableServer::ObjectId &, PortableServer::Servant servant, CORBA::Boolean , CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated // with test_i delete it. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h index 860e67077a5..e6252375228 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h @@ -31,9 +31,7 @@ public: ServantActivator (CORBA::ORB_ptr orb); PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::POA_ptr poa); // This method is invoked by a POA with USE_SERVANT_MANAGER and // RETAIN policies, whenever it receives a request for a test object // that is not currently active. @@ -42,8 +40,7 @@ public: PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean remaining_activations); // This method is invoked whenever a test object is deactivated. private: diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp index 932642e18d9..083ef55fbee 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp @@ -37,8 +37,6 @@ ServantLocator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { // Convert ObjectID to String. @@ -69,7 +67,6 @@ ServantLocator::postinvoke (const PortableServer::ObjectId & /* oid */, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h index cd0556ec60c..ecf820f2886 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h @@ -39,9 +39,7 @@ public: virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, - PortableServer::ServantLocator::Cookie &the_cookie) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::ServantLocator::Cookie &the_cookie); // This method is invoked by a POA whenever it receives a request // for test object that is not currently active. @@ -49,8 +47,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, - PortableServer::Servant the_servant) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::Servant the_servant); // This method is invoked whenever a test servant completes a // request. diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp index 7619f8ab89a..aea5dc9147e 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp @@ -35,8 +35,6 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb) PortableServer::Servant ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { // Convert ObjectId to String. CORBA::String_var s = @@ -61,7 +59,6 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated // with test servant, deactivate it. Etheralization happens on diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h index dfb116a8157..9c6f2250bb0 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h @@ -42,9 +42,7 @@ public: // Initialization. virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::POA_ptr poa); // This method is invoked by a POA with USE_SERVANT_MANAGER and // RETAIN policies, whenever it receives a request for a test object // that is not currently active. When an servant pointer @@ -59,8 +57,7 @@ public: PortableServer::POA_ptr adapter, PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, - CORBA::Boolean remaining_activations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean remaining_activations); // This method is invoked whenever a test servant is // deactivated. This occurs when the POA is destroyed or the Object // is deactivated. When the POA is getting destroyed, it needs to diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp index 71b4174d92c..d54ae5d09f7 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp @@ -37,8 +37,6 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { // Convert ObjectID to String. @@ -73,7 +71,6 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h index e28daa6b5b1..385170cd40e 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h @@ -47,9 +47,7 @@ public: virtual PortableServer::Servant preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, - PortableServer::ServantLocator::Cookie &the_cookie) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::ServantLocator::Cookie &the_cookie); // This method is invoked by a POA whenever it receives a request // for test object that is not currently active. When the POA is // created using the NON_RETAIN policy the Active Object Map is not @@ -64,8 +62,7 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, - PortableServer::Servant the_servant) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::Servant the_servant); // This method is invoked whenever a test servant completes a // request. As the Servant Loactor interface is used when the POA // doesnt maintain the Active Object Map, its necessary to get rid diff --git a/TAO/examples/POA/TIE/test_i.cpp b/TAO/examples/POA/TIE/test_i.cpp index bc557892f28..8fc84b1abae 100644 --- a/TAO/examples/POA/TIE/test_i.cpp +++ b/TAO/examples/POA/TIE/test_i.cpp @@ -32,7 +32,6 @@ Tie_i::~Tie_i (void) // Return this->value CORBA::Long Tie_i::doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } @@ -48,7 +47,6 @@ A_i::A_i (CORBA::Long value, // Return this->value CORBA::Long A_i::doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } @@ -71,7 +69,6 @@ Outer_i::B_i::B_i (CORBA::Long value, // Return this->value CORBA::Long Outer_i::B_i::doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } @@ -94,7 +91,6 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value, // Return this->value CORBA::Long Outer_i::Inner_i::C_i::doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } diff --git a/TAO/examples/POA/TIE/test_i.h b/TAO/examples/POA/TIE/test_i.h index b2a456bc0bf..3450c129f8a 100644 --- a/TAO/examples/POA/TIE/test_i.h +++ b/TAO/examples/POA/TIE/test_i.h @@ -27,8 +27,7 @@ public: virtual ~Tie_i (void); // Simple doit method - virtual CORBA::Long doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long doit (void); protected: @@ -43,8 +42,7 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long doit (void); // Returns the Default POA of this Servant object virtual PortableServer::POA_ptr _default_POA (void); @@ -69,8 +67,7 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long doit (void); // Returns the Default POA of this Servant object virtual PortableServer::POA_ptr _default_POA (void); @@ -95,8 +92,7 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long doit (void); // Returns the Default POA of this Servant object virtual PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp index b5dac673d49..99caf3105fc 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.cpp +++ b/TAO/examples/Persistent_Grid/Grid_i.cpp @@ -61,8 +61,6 @@ void Grid_i::set (CORBA::Short x, CORBA::Short y, CORBA::Long value) - ACE_THROW_SPEC ((CORBA::SystemException, - Grid::RANGE_ERROR)) { if (x < 0 || y < 0 @@ -78,8 +76,6 @@ Grid_i::set (CORBA::Short x, CORBA::Long Grid_i::get (CORBA::Short x, CORBA::Short y) - ACE_THROW_SPEC ((CORBA::SystemException, - Grid::RANGE_ERROR)) { if (x < 0 || y < 0 @@ -94,28 +90,24 @@ Grid_i::get (CORBA::Short x, CORBA::Short Grid_i::width (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->width_; } CORBA::Short Grid_i::height (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->height_; } void Grid_i::width (CORBA::Short x) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->width_ = x; } void Grid_i::height (CORBA::Short y) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->height_ = y; } @@ -123,7 +115,6 @@ Grid_i::height (CORBA::Short y) // Destroy the grid void Grid_i::destroy ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Delete the array. for (int i = 0; i < height_; i++) @@ -165,7 +156,6 @@ Grid_Factory_i::~Grid_Factory_i (void) Grid_ptr Grid_Factory_i::make_grid (CORBA::Short width, CORBA::Short height) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, " (%P|%t) Making a new Grid\n")); @@ -213,7 +203,6 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o) // Shutdown. void Grid_Factory_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, " (%P|%t) %s\n", @@ -225,7 +214,6 @@ Grid_Factory_i::shutdown (void) void Grid_Factory_i::cleanup (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const char *name = "Array"; diff --git a/TAO/examples/Persistent_Grid/Grid_i.h b/TAO/examples/Persistent_Grid/Grid_i.h index c6d665d01a6..4773bb54260 100644 --- a/TAO/examples/Persistent_Grid/Grid_i.h +++ b/TAO/examples/Persistent_Grid/Grid_i.h @@ -42,16 +42,13 @@ public: // Destructor. virtual Grid_ptr make_grid (CORBA::Short, - CORBA::Short) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short); // This function creates and returns a <Grid>. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the server. - virtual void cleanup ( ) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void cleanup ( ); // Do a clean up of the memory map void orb (CORBA::ORB_ptr o); @@ -97,37 +94,28 @@ public: ~Grid_i (void); // Destructor - virtual CORBA::Short width (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short width (void); // Returns the width of the grid - virtual CORBA::Short height (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short height (void); // Returns the height of the grid - virtual void width (CORBA::Short) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void width (CORBA::Short); // Sets the width of the grid. - virtual void height (CORBA::Short) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void height (CORBA::Short); // Sets the height of the grid. virtual void set (CORBA::Short, CORBA::Short, - CORBA::Long) - ACE_THROW_SPEC ((CORBA::SystemException, - Grid::RANGE_ERROR)); + CORBA::Long); // Sets the grid value. virtual CORBA::Long get (CORBA::Short, - CORBA::Short) - ACE_THROW_SPEC ((CORBA::SystemException, - Grid::RANGE_ERROR)); + CORBA::Short); // Gets the grid value. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Destroy the grid. void set_pool (pool_t *); diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp index 034a06c97d5..3a493216ddf 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.cpp @@ -30,7 +30,6 @@ void UDP_i::invoke (const char * client_name, UDP_ptr udpHandler, CORBA::Long request_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -75,7 +74,6 @@ UDP_i::invoke (const char * client_name, void UDP_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%s\n", diff --git a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h index a2c81560b23..993e1228162 100644 --- a/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_i.h @@ -46,11 +46,9 @@ public: virtual void invoke (const char *client_name, UDP_ptr udpHandler, - CORBA::Long request_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long request_id); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the server. diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp index 6061703700d..7665ea1e1fc 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.cpp @@ -30,7 +30,6 @@ UDP_i::orb (CORBA::ORB_ptr orb) void UDP_i::setResponseHandler (UDP_ptr udpHandler) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (udpHandler)) ACE_DEBUG ((LM_DEBUG, @@ -42,7 +41,6 @@ UDP_i::setResponseHandler (UDP_ptr udpHandler) void UDP_i::invoke (const char * client_name, CORBA::Long request_id) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -91,7 +89,6 @@ UDP_i::invoke (const char * client_name, void UDP_i::reset (const char * client_name) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -116,7 +113,6 @@ UDP_i::reset (const char * client_name) void UDP_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%s\n", diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h index a1c42bfc64d..9754f100c19 100644 --- a/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h +++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_i.h @@ -39,19 +39,15 @@ public: ~UDP_i (void); // Destructor - virtual void setResponseHandler (UDP_ptr udpHandler) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void setResponseHandler (UDP_ptr udpHandler); virtual void invoke (const char *client_name, - CORBA::Long request_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long request_id); - virtual void reset (const char * client_name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void reset (const char * client_name); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the server. diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp index 85160bbc5e5..74daec629d4 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.cpp @@ -11,7 +11,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) void Simple_Server_i::sendCharSeq (const Char_Seq &) - ACE_THROW_SPEC ((CORBA::SystemException)) { Simple_Server_count++; //ACE_DEBUG ((LM_DEBUG, ".")); @@ -19,7 +18,6 @@ Simple_Server_i::sendCharSeq (const Char_Seq &) void Simple_Server_i::sendOctetSeq (const Octet_Seq &) - ACE_THROW_SPEC ((CORBA::SystemException)) { Simple_Server_count++; //ACE_DEBUG ((LM_DEBUG, ".")); @@ -27,7 +25,6 @@ Simple_Server_i::sendOctetSeq (const Octet_Seq &) CORBA::Long Simple_Server_i::get_number (CORBA::Long) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long tmp = Simple_Server_count; Simple_Server_count = 0; @@ -36,7 +33,6 @@ Simple_Server_i::get_number (CORBA::Long) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Simple_Server_i::shutdown\n")); diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h index 6eced0ebb9b..bfd469f86e4 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/test_i.h @@ -31,17 +31,13 @@ public: // ctor // = The Simple_Server methods. - void sendCharSeq (const Char_Seq & charSeq) - ACE_THROW_SPEC ((CORBA::SystemException)); + void sendCharSeq (const Char_Seq & charSeq); - void sendOctetSeq (const Octet_Seq & octetSeq) - ACE_THROW_SPEC ((CORBA::SystemException)); + void sendOctetSeq (const Octet_Seq & octetSeq); - CORBA::Long get_number (CORBA::Long num) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long get_number (CORBA::Long num); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp index 5d72123e647..dcd461128ab 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.cpp +++ b/TAO/examples/Quoter/Factory_Finder_i.cpp @@ -41,8 +41,6 @@ Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void) CosLifeCycle::Factories * Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory)) { const char *exception_message = "Null Message"; diff --git a/TAO/examples/Quoter/Factory_Finder_i.h b/TAO/examples/Quoter/Factory_Finder_i.h index 0a3945c5d55..bcd6f4c4996 100644 --- a/TAO/examples/Quoter/Factory_Finder_i.h +++ b/TAO/examples/Quoter/Factory_Finder_i.h @@ -28,9 +28,7 @@ public: Quoter_Factory_Finder_i (int debug_level = 1); ~Quoter_Factory_Finder_i (void); - virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory)); + virtual CosLifeCycle::Factories * find_factories (const CosLifeCycle::Key &factory_key); // Returns a sequence of Factories if factories matching the // factory_key were found. If no factory was found, then the // NoFactory exception, defined in CosLifeCycle, is raised. diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp index 298459a9648..74eb8e88b8f 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.cpp +++ b/TAO/examples/Quoter/Generic_Factory_i.cpp @@ -37,7 +37,6 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void) CORBA::Boolean Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -89,10 +88,6 @@ Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_k CORBA::Object_ptr Quoter_Generic_Factory_i::create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)) { Stock::Quoter_var quoter_var; try diff --git a/TAO/examples/Quoter/Generic_Factory_i.h b/TAO/examples/Quoter/Generic_Factory_i.h index 8245312a87c..d5f46a21778 100644 --- a/TAO/examples/Quoter/Generic_Factory_i.h +++ b/TAO/examples/Quoter/Generic_Factory_i.h @@ -29,17 +29,12 @@ public: Quoter_Generic_Factory_i (int debug_level = 1); ~Quoter_Generic_Factory_i (void); - CORBA::Boolean supports (const CosLifeCycle::Key &factory_key) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean supports (const CosLifeCycle::Key &factory_key); // Returns true if the Generic Factory is able to forward a request // for creating an object described by the <factory_key>. CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, - const CosLifeCycle::Criteria &the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)); + const CosLifeCycle::Criteria &the_criteria); // Returns an object reference to a newly created object, though the // Generic Factory itself cannot create objects, it will forward the // request to a more concrete Factory. diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp index a359d918ee9..9e0ad3525cc 100644 --- a/TAO/examples/Quoter/Quoter_i.cpp +++ b/TAO/examples/Quoter/Quoter_i.cpp @@ -89,8 +89,6 @@ int Quoter_Factory_i::init (void) Stock::Quoter_ptr Quoter_Factory_i::create_quoter (const char *) - ACE_THROW_SPEC ((CORBA::SystemException, - Stock::Invalid_Quoter)) { this->next_quoter_ = (this->next_quoter_ + 1) % this->quoter_num_; @@ -126,9 +124,6 @@ Quoter_i::~Quoter_i (void) CORBA::Long Quoter_i::get_quote (char const *) - ACE_THROW_SPEC ((CORBA::SystemException, - Stock::Invalid_Stock, - Stock::Invalid_Quoter)) { return 42; } @@ -140,11 +135,6 @@ CosLifeCycle::LifeCycleObject_ptr Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there, const CosLifeCycle::Criteria &/*the_criteria*/ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::NotCopyable, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)) { const char *exception_message = "Null message"; CosLifeCycle::LifeCycleObject_ptr lifeCycleObject_ptr = @@ -258,11 +248,6 @@ void Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, const CosLifeCycle::Criteria & /* the_criteria */ ) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::NotMovable, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)) { ACE_ERROR ((LM_ERROR, "Quoter_i::move: The Quoter object is not movable!")); @@ -275,8 +260,6 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */, void Quoter_i::remove (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NotRemovable)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "I have been asked to shut down.\n")); diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h index b0bdc032f20..06d24a017c0 100644 --- a/TAO/examples/Quoter/Quoter_i.h +++ b/TAO/examples/Quoter/Quoter_i.h @@ -43,35 +43,20 @@ public: ~Quoter_i (void); // Destructor - virtual CORBA::Long get_quote (const char *stock_name) - ACE_THROW_SPEC ((CORBA::SystemException, - Stock::Invalid_Stock, - Stock::Invalid_Quoter)); + virtual CORBA::Long get_quote (const char *stock_name); // Returns the current quote for the stock <stock_name> // = Lifecycle methods virtual CosLifeCycle::LifeCycleObject_ptr copy (CosLifeCycle::FactoryFinder_ptr there, - const CosLifeCycle::Criteria &the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::NotCopyable, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)); + const CosLifeCycle::Criteria &the_criteria); // Make a copy of this object virtual void move (CosLifeCycle::FactoryFinder_ptr there, - const CosLifeCycle::Criteria &the_criteria) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NoFactory, - CosLifeCycle::NotMovable, - CosLifeCycle::InvalidCriteria, - CosLifeCycle::CannotMeetCriteria)); + const CosLifeCycle::Criteria &the_criteria); // Move this object using <there> - virtual void remove (void) - ACE_THROW_SPEC ((CORBA::SystemException, - CosLifeCycle::NotRemovable)); + virtual void remove (void); // Removes the object. private: @@ -105,9 +90,7 @@ public: int init (void); // Initialize everything in the factory - virtual Stock::Quoter_ptr create_quoter (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException, - Stock::Invalid_Quoter)); + virtual Stock::Quoter_ptr create_quoter (const char *name); // Return the quoter by the id <name>. private: diff --git a/TAO/examples/RTCORBA/Activity/Job_i.cpp b/TAO/examples/RTCORBA/Activity/Job_i.cpp index a0182cea653..edd048f7776 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.cpp +++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp @@ -35,7 +35,6 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter) void Job_i::work (CORBA::ULong work) - ACE_THROW_SPEC ((CORBA::SystemException)) { static CORBA::ULong prime_number = 9619; @@ -52,7 +51,6 @@ Job_i::work (CORBA::ULong work) void Job_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACTIVITY::instance()->job_ended (this); } diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h index 194b9bd2b1e..7421f8897fe 100644 --- a/TAO/examples/RTCORBA/Activity/Job_i.h +++ b/TAO/examples/RTCORBA/Activity/Job_i.h @@ -38,15 +38,9 @@ class activity_Export Job_i : public POA_Job const ACE_CString& poa (void); /// = inteface Job method implementation. - virtual void work (CORBA::ULong work) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void work (CORBA::ULong work); + + virtual void shutdown (void); protected: /// The name of this Job ACE_CString job_name_; diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp index b8ee3b265c1..afb34758c29 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp @@ -9,21 +9,18 @@ ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter; RTCORBA::Priority Segment_Sched_Param_Policy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } void Segment_Sched_Param_Policy::value (RTCORBA::Priority value) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->value_ = value; } CORBA::Policy_ptr Segment_Sched_Param_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Segment_Sched_Param_Policy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -37,7 +34,6 @@ Segment_Sched_Param_Policy::copy (void) void Segment_Sched_Param_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -63,7 +59,6 @@ Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void) FP_Scheduling::SegmentSchedulingParameterPolicy_ptr Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { FP_Scheduling::SegmentSchedulingParameterPolicy_ptr segment_policy; ACE_NEW_THROW_EX (segment_policy, @@ -86,8 +81,6 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr const char *, CORBA::Policy_ptr /*sched_policy*/, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { } @@ -96,8 +89,6 @@ Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::C const char *name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { this->begin_new_scheduling_segment (guid, name, @@ -110,8 +101,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current const char *name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { this->begin_new_scheduling_segment (guid, name, @@ -123,7 +112,6 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current void Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &, const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -131,7 +119,6 @@ void Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -139,8 +126,6 @@ Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Cur void Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { int priority; @@ -172,8 +157,6 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf CORBA::String_out /*name*/, CORBA::Policy_out /*sched_param*/, CORBA::Policy_out /*implicit_sched_param*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { IOP::ServiceContext* serv_cxt = request_info->get_request_service_context (Server_Interceptor::SchedulingInfo); @@ -217,80 +200,63 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf void Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &) - ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyList* Fixed_Priority_Scheduler::scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } void Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &) - ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyList* Fixed_Priority_Scheduler::poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } char * Fixed_Priority_Scheduler::scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -298,7 +264,6 @@ Fixed_Priority_Scheduler::scheduling_discipline_name (void) RTScheduling::ResourceManager_ptr Fixed_Priority_Scheduler::create_resource_manager (const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -307,6 +272,5 @@ void Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h index 1312733b110..fde76bc7875 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.h @@ -12,17 +12,13 @@ public FP_Scheduling::SegmentSchedulingParameterPolicy, public TAO_Local_RefCounted_Object { public: - virtual RTCORBA::Priority value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RTCORBA::Priority value (void); - virtual void value (RTCORBA::Priority value) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void value (RTCORBA::Priority value); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); private: RTCORBA::Priority value_; @@ -39,100 +35,68 @@ public TAO_Local_RefCounted_Object ~Fixed_Priority_Scheduler (void); virtual FP_Scheduling::SegmentSchedulingParameterPolicy_ptr - create_segment_scheduling_parameter (RTCORBA::Priority segment_priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_segment_scheduling_parameter (RTCORBA::Priority segment_priority); virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid, - const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * name); virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, - CORBA::Policy_ptr outer_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr outer_sched_param); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, RTScheduling::Current::IdType_out guid, CORBA::String_out name, CORBA::Policy_out sched_param, - CORBA::Policy_out implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + CORBA::Policy_out implicit_sched_param); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void cancel (const RTScheduling::Current::IdType & guid) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * scheduling_policies (void); - virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * poa_policies (void); - virtual char * scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * scheduling_discipline_name (void); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); virtual void set_scheduling_parameter (PortableServer::Servant & resource, const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); private: RTScheduling::Current_var current_; diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp index 6aee5a32c81..d42eb82ae2e 100644 --- a/TAO/examples/RTScheduling/Job_i.cpp +++ b/TAO/examples/RTScheduling/Job_i.cpp @@ -53,7 +53,6 @@ Job_i::init (ACE_Arg_Shifter& arg_shifter) void Job_i::work (CORBA::ULong work, CORBA::Short importance) - ACE_THROW_SPEC ((CORBA::SystemException)) { static CORBA::ULong prime_number = 9619; @@ -125,7 +124,6 @@ Job_i::guid (void) void Job_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { dt_creator_->job_ended (); } diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h index 6a79a8f9c3d..c2d3c5d3861 100644 --- a/TAO/examples/RTScheduling/Job_i.h +++ b/TAO/examples/RTScheduling/Job_i.h @@ -45,20 +45,14 @@ class RTSCHEDTESTLIB_Export Job_i : public POA_Job /// = inteface Job method implementation. virtual void work (CORBA::ULong work, - CORBA::Short importance) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + CORBA::Short importance); virtual void post_work (int guid, int importance); void dump_stats (void); - virtual void shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void shutdown (void); int guid (void); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp index c97affc9fbc..aa1bb813242 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp @@ -32,21 +32,18 @@ DT::resume (void) CORBA::Short Segment_Sched_Param_Policy::importance (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->importance_; } void Segment_Sched_Param_Policy::importance (CORBA::Short importance) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->importance_ = importance; } CORBA::Policy_ptr Segment_Sched_Param_Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Segment_Sched_Param_Policy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -60,7 +57,6 @@ Segment_Sched_Param_Policy::copy (void) void Segment_Sched_Param_Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -119,7 +115,6 @@ MIF_Scheduler::resume_main (void) MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr MIF_Scheduler::create_segment_scheduling_parameter (CORBA::Short importance) - ACE_THROW_SPEC ((CORBA::SystemException)) { MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr segment_policy; ACE_NEW_THROW_EX (segment_policy, @@ -141,8 +136,6 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType const char *, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { size_t count = 0; ACE_OS::memcpy (&count, @@ -183,8 +176,6 @@ MIF_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT const char *name, CORBA::Policy_ptr sched_param, CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { this->begin_new_scheduling_segment (guid, name, @@ -197,8 +188,6 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/ const char* /*name*/, CORBA::Policy_ptr sched_policy, CORBA::Policy_ptr /*implicit_sched_param*/) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { size_t count = 0; ACE_OS::memcpy (&count, @@ -248,7 +237,6 @@ MIF_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &/ void MIF_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &guid, const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { size_t count = 0; ACE_OS::memcpy (&count, @@ -275,14 +263,11 @@ void MIF_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var = MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ()); @@ -364,8 +349,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque CORBA::String_out, CORBA::Policy_out sched_param_out, CORBA::Policy_out /*implicit_sched_param*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) @@ -435,7 +418,6 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque void MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { RTScheduling::Current::IdType* guid = current_->id (); @@ -463,8 +445,6 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr) void MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (ready_que_.message_count () > 0) { @@ -480,8 +460,6 @@ MIF_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr) void MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (TAO_debug_level > 0) { @@ -512,14 +490,11 @@ MIF_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr) void MIF_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var = @@ -567,8 +542,6 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr) void MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var = MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ()); @@ -609,8 +582,6 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr) void MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { MIF_Scheduling::SegmentSchedulingParameterPolicy_var sched_param_var = MIF_Scheduling::SegmentSchedulingParameterPolicy::_narrow (current_->scheduling_parameter ()); @@ -651,33 +622,28 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr) void MIF_Scheduler::cancel (const RTScheduling::Current::IdType &) - ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyList* MIF_Scheduler::scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } void MIF_Scheduler::scheduling_policies (const CORBA::PolicyList &) - ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyList* MIF_Scheduler::poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } char * MIF_Scheduler::scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -685,7 +651,6 @@ MIF_Scheduler::scheduling_discipline_name (void) RTScheduling::ResourceManager_ptr MIF_Scheduler::create_resource_manager (const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -694,6 +659,5 @@ void MIF_Scheduler::set_scheduling_parameter (PortableServer::Servant &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h index ee1f5371f55..18a16e78234 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.h @@ -34,17 +34,13 @@ public MIF_Scheduling::SegmentSchedulingParameterPolicy, public TAO_Local_RefCounted_Object { public: - virtual CORBA::Short importance (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short importance (void); - virtual void importance (CORBA::Short importance) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void importance (CORBA::Short importance); - CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr copy (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); private: CORBA::Short importance_; @@ -64,8 +60,7 @@ public TAO_Local_RefCounted_Object virtual MIF_Scheduling::SegmentSchedulingParameterPolicy_ptr - create_segment_scheduling_parameter (CORBA::Short segment_priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + create_segment_scheduling_parameter (CORBA::Short segment_priority); void wait (void); @@ -76,94 +71,63 @@ public TAO_Local_RefCounted_Object virtual void begin_new_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void begin_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void update_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, CORBA::Policy_ptr sched_param, - CORBA::Policy_ptr implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)); + CORBA::Policy_ptr implicit_sched_param); virtual void end_scheduling_segment (const RTScheduling::Current::IdType & guid, - const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * name); virtual void end_nested_scheduling_segment (const RTScheduling::Current::IdType & guid, const char * name, - CORBA::Policy_ptr outer_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr outer_sched_param); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri, RTScheduling::Current::IdType_out guid, CORBA::String_out name, CORBA::Policy_out sched_param, - CORBA::Policy_out implicit_sched_param) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + CORBA::Policy_out implicit_sched_param); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void cancel (const RTScheduling::Current::IdType & guid) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void cancel (const RTScheduling::Current::IdType & guid); - virtual CORBA::PolicyList * scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * scheduling_policies (void); - virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyList * poa_policies (void); - virtual char * scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * scheduling_discipline_name (void); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); virtual void set_scheduling_parameter (PortableServer::Servant & resource, const char * name, - CORBA::Policy_ptr scheduling_parameter) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Policy_ptr scheduling_parameter); private: RTScheduling::Current_var current_; diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp index 43f48446ccf..4357fd8cdcb 100644 --- a/TAO/examples/RTScheduling/Synch_i.cpp +++ b/TAO/examples/RTScheduling/Synch_i.cpp @@ -9,7 +9,6 @@ Synch_i::Synch_i (void) void Synch_i::go (CORBA::Long base_time) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "GO\n")); diff --git a/TAO/examples/RTScheduling/Synch_i.h b/TAO/examples/RTScheduling/Synch_i.h index 9758f3bd8c4..248895d9a18 100644 --- a/TAO/examples/RTScheduling/Synch_i.h +++ b/TAO/examples/RTScheduling/Synch_i.h @@ -10,8 +10,7 @@ class SYNCH_Export Synch_i : public POA_Synch public: Synch_i (void); - virtual void go (CORBA::Long base_time) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void go (CORBA::Long base_time); int synched (void); diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp index 51befcb7a8d..2cc8345a076 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.cpp +++ b/TAO/examples/Simple/bank/AccountManager_i.cpp @@ -46,7 +46,6 @@ AccountManager_i::set_orb_manager (TAO_ORB_Manager *orb_manager) Bank::Account_ptr AccountManager_i::open (const char *name, CORBA::Float initial_balance) - ACE_THROW_SPEC ((CORBA::SystemException)) { Account_i *result = 0; @@ -91,7 +90,6 @@ AccountManager_i::open (const char *name, void AccountManager_i::close (Bank::Account_ptr account) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -118,7 +116,6 @@ AccountManager_i::close (Bank::Account_ptr account) void AccountManager_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "\n[SERVER] Process/Thread Id : (%P/%t) %s\n", diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h index 441152eafa6..f7e37df9d97 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.h +++ b/TAO/examples/Simple/bank/AccountManager_i.h @@ -56,17 +56,14 @@ public: // Destructor. virtual Bank::Account_ptr open (const char *name, - CORBA::Float initial_balance) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Float initial_balance); // Return the Account interface with the given name from the server. // Put the initial balance specified in the new account. - virtual void close (Bank::Account_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void close (Bank::Account_ptr); // Close the given account. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the server. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simple/bank/Account_i.cpp b/TAO/examples/Simple/bank/Account_i.cpp index 6243c29e421..ca440ad854c 100644 --- a/TAO/examples/Simple/bank/Account_i.cpp +++ b/TAO/examples/Simple/bank/Account_i.cpp @@ -38,22 +38,18 @@ Account_i::orb (CORBA::ORB_ptr o) CORBA::Float Account_i::balance (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return balance_; } void Account_i::deposit (CORBA::Float deposit) - ACE_THROW_SPEC ((CORBA::SystemException)) { balance_ += deposit; } void Account_i::withdraw (CORBA::Float withdrawl) - ACE_THROW_SPEC ((CORBA::SystemException, - Bank::Account::Overdraft)) { if (balance_ >= withdrawl) balance_ -= withdrawl; @@ -63,14 +59,12 @@ Account_i::withdraw (CORBA::Float withdrawl) char * Account_i::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.in ()); } void Account_i::name (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (name); } diff --git a/TAO/examples/Simple/bank/Account_i.h b/TAO/examples/Simple/bank/Account_i.h index 657a53f1156..77d8c2a20e5 100644 --- a/TAO/examples/Simple/bank/Account_i.h +++ b/TAO/examples/Simple/bank/Account_i.h @@ -42,26 +42,20 @@ public: ~Account_i (void); // Destructor. - virtual CORBA::Float balance (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Float balance (void); // Get the current balance in the account. - virtual char *name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char *name (void); // Get the name of the <Account> holder. - virtual void name (const char *name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void name (const char *name); // Set the name of the <Account> holder. - virtual void deposit (CORBA::Float) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void deposit (CORBA::Float); // Deposit money in the account. - virtual void withdraw (CORBA::Float) - ACE_THROW_SPEC ((CORBA::SystemException, - Bank::Account::Overdraft)); + virtual void withdraw (CORBA::Float); // Withdraw money in the account. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simple/chat/Broadcaster_i.cpp b/TAO/examples/Simple/chat/Broadcaster_i.cpp index 24ad01cda93..66d570eac15 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.cpp +++ b/TAO/examples/Simple/chat/Broadcaster_i.cpp @@ -44,10 +44,6 @@ Broadcaster_i::~Broadcaster_i (void) void Broadcaster_i::add (Receiver_ptr receiver, const char *nickname) - ACE_THROW_SPEC (( - CORBA::SystemException, - Broadcaster::CannotAdd - )) { Broadcaster_i::Receiver_Data receiver_data; @@ -77,10 +73,6 @@ Broadcaster_i::add (Receiver_ptr receiver, void Broadcaster_i::remove (Receiver_ptr receiver) - ACE_THROW_SPEC (( - CORBA::SystemException, - Broadcaster::CannotRemove - )) { Broadcaster_i::Receiver_Data receiver_data_to_remove; @@ -117,9 +109,6 @@ Broadcaster_i::remove (Receiver_ptr receiver) void Broadcaster_i::say (Receiver_ptr receiver, const char *text) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { try { diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h index dbe9857c821..e893d69adab 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.h +++ b/TAO/examples/Simple/chat/Broadcaster_i.h @@ -45,25 +45,14 @@ public: // Destructor. virtual void add (Receiver_ptr receiver, - const char *nickname) - ACE_THROW_SPEC (( - CORBA::SystemException, - Broadcaster::CannotAdd - )); + const char *nickname); // Saves receiver references in a list. - virtual void remove (Receiver_ptr receiver) - ACE_THROW_SPEC (( - CORBA::SystemException, - Broadcaster::CannotRemove - )); + virtual void remove (Receiver_ptr receiver); // Removes receiver references from the list. virtual void say (Receiver_ptr receiver, - const char *text) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + const char *text); // Called by Broadcaster clients to send messages. public: diff --git a/TAO/examples/Simple/chat/Receiver_i.cpp b/TAO/examples/Simple/chat/Receiver_i.cpp index 76f87bb8ec5..acbb73f7f3d 100644 --- a/TAO/examples/Simple/chat/Receiver_i.cpp +++ b/TAO/examples/Simple/chat/Receiver_i.cpp @@ -29,9 +29,6 @@ Receiver_i::~Receiver_i (void) void Receiver_i::message (const char *msg) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG ((LM_DEBUG, ": %s\n", @@ -40,9 +37,6 @@ Receiver_i::message (const char *msg) void Receiver_i::shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Instruct the ORB to shutdown. this->orb_->shutdown (); diff --git a/TAO/examples/Simple/chat/Receiver_i.h b/TAO/examples/Simple/chat/Receiver_i.h index 8db9998cc4a..d1e5a900706 100644 --- a/TAO/examples/Simple/chat/Receiver_i.h +++ b/TAO/examples/Simple/chat/Receiver_i.h @@ -37,16 +37,10 @@ public: ~Receiver_i (void); // Destructor. - virtual void message (const char *msg) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void message (const char *msg); // Receives a message string. - virtual void shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void shutdown (void); // Called when the chat server is going away. The client // implementation should shutdown the chat client in response to // this. diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp index ccb84e7bb07..f74fbf70e90 100644 --- a/TAO/examples/Simple/echo/Echo_i.cpp +++ b/TAO/examples/Simple/echo/Echo_i.cpp @@ -28,7 +28,6 @@ Echo_i::orb (CORBA::ORB_ptr o) Echo::List * Echo_i::echo_list (const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { Echo::List_var list; @@ -61,7 +60,6 @@ Echo_i::echo_list (const char *) char * Echo_i::echo_string (const char *mesg) - ACE_THROW_SPEC ((CORBA::SystemException)) { // The pointer mesg was NULL, return. if (mesg == 0) @@ -87,7 +85,6 @@ Echo_i::echo_string (const char *mesg) void Echo_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "\n%s\n", diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h index 1b5628a6a0e..2ec327e5f8d 100644 --- a/TAO/examples/Simple/echo/Echo_i.h +++ b/TAO/examples/Simple/echo/Echo_i.h @@ -40,16 +40,13 @@ public: ~Echo_i (void); // Destructor. - virtual Echo::List *echo_list (const char *mesg) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Echo::List *echo_list (const char *mesg); // Return the mesg string back from the server. - virtual char *echo_string (const char *mesg) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char *echo_string (const char *mesg); // Return the mesg string back from the server. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the server. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp index f78783ce7eb..ac8bd324bd9 100644 --- a/TAO/examples/Simple/grid/Grid_i.cpp +++ b/TAO/examples/Simple/grid/Grid_i.cpp @@ -48,8 +48,6 @@ void Grid_i::set (CORBA::Short x, CORBA::Short y, CORBA::Long value) - ACE_THROW_SPEC ((CORBA::SystemException, - Grid::RANGE_ERROR)) { if (x < 0 || y < 0 @@ -65,8 +63,6 @@ Grid_i::set (CORBA::Short x, CORBA::Long Grid_i::get (CORBA::Short x, CORBA::Short y) - ACE_THROW_SPEC ((CORBA::SystemException, - Grid::RANGE_ERROR)) { if (x < 0 || y < 0 @@ -81,28 +77,24 @@ Grid_i::get (CORBA::Short x, CORBA::Short Grid_i::width (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->width_; } CORBA::Short Grid_i::height (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->height_; } void Grid_i::width (CORBA::Short x) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->width_ = x; } void Grid_i::height (CORBA::Short y) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->height_ = y; } @@ -111,7 +103,6 @@ Grid_i::height (CORBA::Short y) void Grid_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Delete the array. @@ -137,7 +128,6 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o) void Grid_Factory_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s\n", @@ -166,7 +156,6 @@ Grid_Factory_i::~Grid_Factory_i (void) Grid_ptr Grid_Factory_i::make_grid (CORBA::Short width, CORBA::Short height) - ACE_THROW_SPEC ((CORBA::SystemException)) { Grid_i *grid_ptr = 0; diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h index 2911b466cca..e1393305fb8 100644 --- a/TAO/examples/Simple/grid/Grid_i.h +++ b/TAO/examples/Simple/grid/Grid_i.h @@ -41,37 +41,28 @@ public: ~Grid_i (void); // Destructor - virtual CORBA::Short width (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short width (void); // Returns the width of the grid - virtual CORBA::Short height (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short height (void); // Returns the height of the grid - virtual void width (CORBA::Short) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void width (CORBA::Short); // Sets the width of the grid. - virtual void height (CORBA::Short) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void height (CORBA::Short); // Sets the height of the grid. virtual void set (CORBA::Short, CORBA::Short, - CORBA::Long) - ACE_THROW_SPEC ((CORBA::SystemException, - Grid::RANGE_ERROR)); + CORBA::Long); // Sets the grid value. virtual CORBA::Long get (CORBA::Short, - CORBA::Short) - ACE_THROW_SPEC ((CORBA::SystemException, - Grid::RANGE_ERROR)); + CORBA::Short); // Gets the grid value. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); // Destroy the grid. @@ -99,12 +90,10 @@ public: // Destructor. virtual Grid_ptr make_grid (CORBA::Short, - CORBA::Short) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short); // This function creates and returns a <Grid>. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the server. void orb (CORBA::ORB_ptr o); diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp index 0f7479f7882..f2996be3ecd 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.cpp +++ b/TAO/examples/Simple/time-date/Time_Date_i.cpp @@ -8,7 +8,6 @@ void Time_Date_i::bin_date (CORBA::Long_out time_date) - ACE_THROW_SPEC ((CORBA::SystemException)) { time_date = ACE_OS::time (0); } @@ -17,7 +16,6 @@ Time_Date_i::bin_date (CORBA::Long_out time_date) void Time_Date_i::str_date (CORBA::String_out time_date) - ACE_THROW_SPEC ((CORBA::SystemException)) { const time_t time = ACE_OS::time (0); diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h index b4dcac8018c..96ef47f8003 100644 --- a/TAO/examples/Simple/time-date/Time_Date_i.h +++ b/TAO/examples/Simple/time-date/Time_Date_i.h @@ -34,13 +34,11 @@ class Time_Date_i public: // = Initialization and termination methods. - virtual void bin_date (CORBA::Long_out time_date) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void bin_date (CORBA::Long_out time_date); // Obtain the time and date in binary format. - virtual void str_date (CORBA::String_out time_date) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void str_date (CORBA::String_out time_date); // Obtain the time and date in string format. void orb (CORBA::ORB_ptr orb_ptr); diff --git a/TAO/examples/Simple/time/Time_i.cpp b/TAO/examples/Simple/time/Time_i.cpp index d7db9b30c7b..19ded656f71 100644 --- a/TAO/examples/Simple/time/Time_i.cpp +++ b/TAO/examples/Simple/time/Time_i.cpp @@ -30,7 +30,6 @@ Time_i::orb (CORBA::ORB_ptr o) CORBA::Long Time_i::current_time (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Long (ACE_OS::time (0)); } @@ -39,7 +38,6 @@ Time_i::current_time (void) void Time_i::shutdown ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%s\n", diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h index 621c8519fe8..904f575851b 100644 --- a/TAO/examples/Simple/time/Time_i.h +++ b/TAO/examples/Simple/time/Time_i.h @@ -39,12 +39,10 @@ public: ~Time_i (void); // Destructor - virtual CORBA::Long current_time (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long current_time (void); // Return the current time/date on the server - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); // Shutdown the server. diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h index 9a0daa7cd8a..4061b552e55 100644 --- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h +++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.h @@ -77,7 +77,6 @@ private: public: virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp index bdedb6c27ff..50c27673806 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp @@ -278,7 +278,6 @@ DualEC_Supplier::init () void DualEC_Supplier::Terminator::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_ORB_Core_instance ()->orb ()->shutdown (); } diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h index 1b9695b9cc0..cb6f64519f6 100644 --- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h +++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.h @@ -81,8 +81,7 @@ private: // = DESCRIPTION // Private class that implements a termination servant. { - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); }; static ACE_THR_FUNC_RETURN run_orb (void *); diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp index 0ae7315b44f..3f25d180b64 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp @@ -133,7 +133,6 @@ Demo_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec, void Demo_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Consumer received disconnect from channel.\n")); @@ -141,7 +140,6 @@ Demo_Consumer::disconnect_push_consumer (void) void Demo_Consumer::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.h b/TAO/examples/Simulator/Event_Supplier/Event_Con.h index b18544679c8..89c2b4cd905 100644 --- a/TAO/examples/Simulator/Event_Supplier/Event_Con.h +++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.h @@ -46,13 +46,11 @@ public: // supplier. Stores <my_name> for printing out messages. Returns 0 // on success, -1 on failure. - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_consumer (void); // The channel is disconnecting. // = (not protected to allow short-circuiting) protected: - virtual void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet &events); // If the <events>[0] is a notification, prints out the data from // the supplier. If its a shutdown message, the consumer // disconnects from the channel. diff --git a/TAO/examples/ior_corbaloc/status_i.cpp b/TAO/examples/ior_corbaloc/status_i.cpp index fc47f429511..ebc94e73019 100644 --- a/TAO/examples/ior_corbaloc/status_i.cpp +++ b/TAO/examples/ior_corbaloc/status_i.cpp @@ -10,7 +10,6 @@ corbaloc_Status_i::corbaloc_Status_i () CORBA::Boolean corbaloc_Status_i::print_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // If the server received the request from the client, return true // == 0; diff --git a/TAO/examples/ior_corbaloc/status_i.h b/TAO/examples/ior_corbaloc/status_i.h index 3b3495833db..7873d238dc3 100644 --- a/TAO/examples/ior_corbaloc/status_i.h +++ b/TAO/examples/ior_corbaloc/status_i.h @@ -11,8 +11,7 @@ class corbaloc_Status_i : public POA_corbaloc::Status public: corbaloc_Status_i (); - CORBA::Boolean print_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean print_status (void); void set_name (const char *name) { server_name_ = name; } |