diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-12 11:52:38 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-02-12 11:52:38 +0000 |
| commit | 4a94bf9e8e96ce495aedaf6ef0829e42a4489742 (patch) | |
| tree | b1209abef436be321023aa6100646e884be3ada9 /TAO/tests | |
| parent | 1a4c23d60cf23b6e97877d6ecf77142e95e7b1fc (diff) | |
| download | ATCD-4a94bf9e8e96ce495aedaf6ef0829e42a4489742.tar.gz | |
Mon Feb 12 11:40:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tests')
664 files changed, 1204 insertions, 4538 deletions
diff --git a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc index 40ae9a4d2a7..a9b82ddc549 100644 --- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc +++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc @@ -20,7 +20,7 @@ project(*Server): taoserver, amh, strategies { } project(*Client): taoexe, amh, portableserver, strategies { - after += *Server + after += *idl Source_Files { client.cpp TestS.cpp diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index eedafb22c35..01e3244e6c6 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -15,11 +15,9 @@ public: ST_AMH_Servant (CORBA::ORB_ptr orb); void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::Timestamp send_time); - void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (Test::AMH_RoundtripResponseHandler_ptr _tao_rh); protected: CORBA::ORB_ptr orb_; @@ -37,7 +35,6 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb) void ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, Test::Timestamp send_time) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Throw an overload exception @@ -58,7 +55,6 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, void ST_AMH_Servant::shutdown (Test::AMH_RoundtripResponseHandler_ptr /*_tao_rh*/) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp index 24246020a1d..b6417931581 100644 --- a/TAO/tests/AMH_Oneway/server.cpp +++ b/TAO/tests/AMH_Oneway/server.cpp @@ -41,8 +41,7 @@ public: ST_AMH_Servant (CORBA::ORB_ptr orb); void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::Timestamp send_time); protected: CORBA::ORB_var orb_; @@ -60,7 +59,6 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb) void ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, Test::Timestamp send_time) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_OS::sleep (1); ACE_DEBUG ((LM_DEBUG, "Recieved Timestamp # %d \n", calls_received)); diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc index 69265f72525..eb64c8382f6 100644 --- a/TAO/tests/AMI/AMI.mpc +++ b/TAO/tests/AMI/AMI.mpc @@ -21,7 +21,7 @@ project(*Server): taoserver, messaging, ami { } project(*Client): messaging, taoexe, portableserver, ami { - after += *Server + after += *idl Source_Files { client.cpp ami_testS.cpp @@ -32,7 +32,7 @@ project(*Client): messaging, taoexe, portableserver, ami { } project(*Simple Client): messaging, taoexe, portableserver, ami { - after += *Server + after += *idl Source_Files { simple_client.cpp ami_testS.cpp diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp index bfa216d5958..89ae759ce04 100644 --- a/TAO/tests/AMI/ami_test_i.cpp +++ b/TAO/tests/AMI/ami_test_i.cpp @@ -30,8 +30,6 @@ CORBA::Long AMI_Test_i::foo (CORBA::Long_out out_l, CORBA::Long in_l, const char* in_str) - ACE_THROW_SPEC ((CORBA::SystemException, - A::DidTheRightThing)) { out_l = 931233; @@ -55,7 +53,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void AMI_Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } @@ -63,7 +60,6 @@ AMI_Test_i::shutdown (void) CORBA::Long AMI_Test_i::yadda (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n")); @@ -73,7 +69,6 @@ AMI_Test_i::yadda (void) void AMI_Test_i::yadda (CORBA::Long yadda) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "%N:%l:(%P:%t):AMI_Test_i::(set_)yadda\n")); @@ -82,7 +77,6 @@ AMI_Test_i::yadda (CORBA::Long yadda) void AMI_Test_i::inout_arg_test (char *&) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No action, this operation is to test code generation for INOUT // args in AMI operations. diff --git a/TAO/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h index 12070d3c5cd..d622f225d41 100644 --- a/TAO/tests/AMI/ami_test_i.h +++ b/TAO/tests/AMI/ami_test_i.h @@ -31,21 +31,15 @@ public: // The AMI_Test methods. CORBA::Long foo (CORBA::Long_out out_l, CORBA::Long in_l, - const char* in_str) - ACE_THROW_SPEC ((CORBA::SystemException, - A::DidTheRightThing)); + const char* in_str); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); - CORBA::Long yadda (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long yadda (void); - void yadda (CORBA::Long yadda) - ACE_THROW_SPEC ((CORBA::SystemException)); + void yadda (CORBA::Long yadda); - void inout_arg_test (char *& str) - ACE_THROW_SPEC ((CORBA::SystemException)); + void inout_arg_test (char *& str); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 90a29705097..e03fb3dc157 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -99,7 +99,6 @@ public: void foo (CORBA::Long result, CORBA::Long out_l) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) { @@ -113,7 +112,6 @@ public: }; void foo_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -129,7 +127,6 @@ public: }; void get_yadda (CORBA::Long result) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda> called: result <%d>\n", @@ -137,21 +134,18 @@ public: }; void get_yadda_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda_excep> called: \n")); }; void set_yadda (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda> called: \n")); }; void set_yadda_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called: \n")); @@ -161,14 +155,12 @@ public: void inout_arg_test ( const char * ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called: \n")); } void inout_arg_test_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } }; diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 93e92476321..add285c7b5f 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -75,7 +75,6 @@ public: void foo (CORBA::Long ami_return_val, CORBA::Long out_l) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) { @@ -87,7 +86,6 @@ public: }; void foo_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -112,7 +110,6 @@ public: void get_yadda (CORBA::Long result) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda> called: result <%d>\n", @@ -120,21 +117,18 @@ public: }; void get_yadda_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <get_yadda_excep> called: \n")); }; void set_yadda (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda> called: \n")); }; void set_yadda_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called: \n")); @@ -143,14 +137,12 @@ public: void inout_arg_test ( const char * ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called: \n")); } void inout_arg_test_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } }; diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp index a85b561d23e..6fe9b1a0db7 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp @@ -30,7 +30,6 @@ AMI_Buffering::Nest_Guard::~Nest_Guard (void) void AMI_Buffering::receive_data (const Test::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -47,20 +46,17 @@ AMI_Buffering::receive_data (const Test::Payload &the_payload) void AMI_Buffering::flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void AMI_Buffering::sync (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->admin_->flush (); } void AMI_Buffering::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->must_shutdown_ = true; this->try_shutdown(); diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h index e5df2680bee..a1717c10a71 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h @@ -18,17 +18,13 @@ public: Test::AMI_Buffering_Admin_ptr admin); // = The skeleton methods - virtual void receive_data (const Test::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_data (const Test::Payload &the_payload); - virtual void flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void flush (void); - virtual void sync (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sync (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); /// internal implementation of shutdown. This void try_shutdown (void); diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc index 5fb820f88c7..2d383c84e22 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc @@ -21,7 +21,7 @@ project(*Server): taoserver, ami { } project(*Client): taoserver, ami { - after += *Server + after += *idl exename = client Source_Files { Client_Task.cpp @@ -35,7 +35,7 @@ project(*Client): taoserver, ami { } project(*Admin): taoserver, ami { - after += *Client + after += *idl exename = admin Source_Files { AMI_Buffering_Admin.cpp diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp index cf00721a861..22ed84d2379 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp @@ -14,21 +14,18 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb) CORBA::ULong AMI_Buffering_Admin::request_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_count_; } CORBA::ULong AMI_Buffering_Admin::bytes_received_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->bytes_received_count_; } void AMI_Buffering_Admin::request_received (CORBA::ULong payload_length) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->request_count_++; this->bytes_received_count_ += payload_length; @@ -36,13 +33,11 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length) void AMI_Buffering_Admin::flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void AMI_Buffering_Admin::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h index 6deca90143b..e09021b0da2 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h @@ -17,20 +17,15 @@ public: AMI_Buffering_Admin (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong request_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong request_count (void); - virtual CORBA::ULong bytes_received_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong bytes_received_count (void); - virtual void request_received (CORBA::ULong payload_length) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void request_received (CORBA::ULong payload_length); - virtual void flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void flush (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp index ef5d94d28be..8742d78f98c 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp +++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp @@ -11,13 +11,11 @@ Reply_Handler::Reply_Handler (void) void Reply_Handler::receive_data (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -31,13 +29,11 @@ Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder) void Reply_Handler::sync (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -51,13 +47,11 @@ Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder) void Reply_Handler::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Reply_Handler::shutdown_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h index 34638d1a812..66d27640d7c 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.h +++ b/TAO/tests/AMI_Buffering/Reply_Handler.h @@ -17,20 +17,14 @@ public: Reply_Handler (void); // = The skeleton methods - virtual void receive_data (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_data_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_data (void); + virtual void receive_data_excep (::Messaging::ExceptionHolder *holder); - virtual void sync (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void sync_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sync (void); + virtual void sync_excep (::Messaging::ExceptionHolder *holder); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); + virtual void shutdown_excep (::Messaging::ExceptionHolder *holder); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc index ae39f7b15c7..e064d725fd2 100644 --- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc +++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc @@ -22,7 +22,7 @@ project(*Server): taoserver, ami { } project(*Client): taoserver, ami { - after += *Server + after += *idl exename = client Source_Files { timeout_i.cpp diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp index 85e35ccbf46..3dc5e32e2dc 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp @@ -30,7 +30,6 @@ Timeout_i::~Timeout_i () void Timeout_i::sendTimeToWait (CORBA::Long msec) - ACE_THROW_SPEC ((CORBA::SystemException)) { //ACE_DEBUG ((LM_DEBUG, // "Timeout_i::sendTimeToWait: invoked with msec = %d\n\n", @@ -48,7 +47,6 @@ Timeout_i::sendTimeToWait (CORBA::Long msec) void Timeout_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { orb_->shutdown (); //ACE_DEBUG ((LM_DEBUG, @@ -72,7 +70,6 @@ TimeoutHandler_i::~TimeoutHandler_i () void TimeoutHandler_i::sendTimeToWait (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "reply")); @@ -82,7 +79,6 @@ TimeoutHandler_i::sendTimeToWait (void) void TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { timer_.stop (); diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h index d82a6c73eee..cde9fbcea71 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.h +++ b/TAO/tests/AMI_Timeouts/timeout_i.h @@ -31,11 +31,9 @@ public: ~Timeout_i (); - virtual void sendTimeToWait (CORBA::Long msec) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sendTimeToWait (CORBA::Long msec); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: @@ -50,12 +48,10 @@ public: ~TimeoutHandler_i (); - virtual void sendTimeToWait (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sendTimeToWait (void); virtual void sendTimeToWait_excep ( - ::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::Messaging::ExceptionHolder * excep_holder); void reset_reply_counter (); diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp index 9eea47d82b6..b81ae04a431 100644 --- a/TAO/tests/Abstract_Interface/test_i.cpp +++ b/TAO/tests/Abstract_Interface/test_i.cpp @@ -11,10 +11,6 @@ ACE_RCSID (Abstract_Interface, char * foo_i::foo_op (const char * inarg) - ACE_THROW_SPEC (( - CORBA::SystemException, - BadInput - )) { CORBA::String_var retval = CORBA::string_dup ("bad"); @@ -32,10 +28,6 @@ foo_i::foo_op (const char * inarg) char * foo_i::base_op (const char * inarg) - ACE_THROW_SPEC (( - CORBA::SystemException, - BadInput - )) { CORBA::String_var retval = CORBA::string_dup ("bad"); @@ -53,9 +45,6 @@ foo_i::base_op (const char * inarg) void passer_i::pass_ops (base_out outarg) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { foo_i *servant = 0; ACE_NEW (servant, @@ -66,9 +55,6 @@ passer_i::pass_ops (base_out outarg) void passer_i::pass_state (base_out outarg) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { TreeController_var tc; ACE_NEW (tc.inout (), diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h index f389142c342..361fb433ab8 100644 --- a/TAO/tests/Abstract_Interface/test_i.h +++ b/TAO/tests/Abstract_Interface/test_i.h @@ -7,30 +7,16 @@ class foo_i : public virtual POA_foo { - virtual char * foo_op (const char * inarg) - ACE_THROW_SPEC (( - CORBA::SystemException, - BadInput - )); + virtual char * foo_op (const char * inarg); - virtual char * base_op (const char * inarg) - ACE_THROW_SPEC (( - CORBA::SystemException, - BadInput - )); + virtual char * base_op (const char * inarg); }; class passer_i : public virtual POA_passer { - virtual void pass_ops (base_out outarg) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void pass_ops (base_out outarg); - virtual void pass_state (base_out outarg) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual void pass_state (base_out outarg); }; #endif /* TAO_TEST_I_H */ diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp index b023cf9d179..eb2603dd591 100644 --- a/TAO/tests/Any/Recursive/Hello.cpp +++ b/TAO/tests/Any/Recursive/Hello.cpp @@ -15,7 +15,6 @@ Hello::Hello (CORBA::ORB_ptr orb) CORBA::Any * Hello::get_any (CORBA::Any const & the_any) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any * retval = 0; @@ -29,7 +28,6 @@ Hello::get_any (CORBA::Any const & the_any) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Any/Recursive/Hello.h b/TAO/tests/Any/Recursive/Hello.h index 07a967ea5e9..64c39d87300 100644 --- a/TAO/tests/Any/Recursive/Hello.h +++ b/TAO/tests/Any/Recursive/Hello.h @@ -27,11 +27,9 @@ public: Hello (CORBA::ORB_ptr orb); // Return the any provide as an "in" argument. - virtual CORBA::Any * get_any (CORBA::Any const & the_any) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Any * get_any (CORBA::Any const & the_any); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc index 00c51507577..1a24787bc1e 100644 --- a/TAO/tests/Any/Recursive/RecursiveHello.mpc +++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc @@ -27,7 +27,6 @@ project(*Server): taoserver, valuetype { project(*Client): taoclient, valuetype, typecodefactory { after += *idl - after += *Server Source_Files { TestC.cpp diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp index dedcddd24ec..a5679c92250 100644 --- a/TAO/tests/BiDirectional/test_i.cpp +++ b/TAO/tests/BiDirectional/test_i.cpp @@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional, test_i, "$Id$") void Callback_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (0); @@ -23,7 +22,6 @@ Callback_i::shutdown (void) void Callback_i::callback_method ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Callback method called \n")); @@ -35,7 +33,6 @@ Callback_i::callback_method ( /**/) CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback ) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) { @@ -48,7 +45,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback void Simple_Server_i::callback_object (Callback_ptr callback ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object this->callback_ = Callback::_duplicate (callback); @@ -87,7 +83,6 @@ Simple_Server_i::call_client (void) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h index 33333f74968..cc4725dc141 100644 --- a/TAO/tests/BiDirectional/test_i.h +++ b/TAO/tests/BiDirectional/test_i.h @@ -31,12 +31,10 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); // Safe way to shutdown - void callback_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_method (void); // The callback method private: @@ -58,14 +56,11 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Boolean do_callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Boolean do_callback); - void callback_object (Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_object (Callback_ptr callback); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); int call_client (void); diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp index b79b40c2520..8c5391e8782 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp @@ -15,7 +15,6 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") void Callback_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (0); @@ -23,7 +22,6 @@ Callback_i::shutdown (void) void Callback_i::callback_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Callback method called \n")); @@ -62,7 +60,6 @@ Simple_Server_i::handle_timeout (const ACE_Time_Value &, CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) { @@ -88,7 +85,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback) void Simple_Server_i::callback_object (Callback_ptr callback ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object this->callback_ = Callback::_duplicate (callback); @@ -97,7 +93,6 @@ Simple_Server_i::callback_object (Callback_ptr callback void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (false); } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h index 040bb9a9f53..6e8ca0fa859 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h @@ -32,12 +32,10 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); // Safe way to shutdown - void callback_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_method (void); // The callback method private: @@ -58,14 +56,11 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Boolean do_callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Boolean do_callback); - void callback_object (Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_object (Callback_ptr callback); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); virtual int handle_timeout (const ACE_Time_Value ¤t_time, const void *act = 0); diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index 2b3eb2fd280..038cf606fbd 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -14,7 +14,6 @@ ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$") void Callback_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (0); @@ -22,7 +21,6 @@ Callback_i::shutdown (void) void Callback_i::callback_method ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Callback method called \n")); @@ -33,7 +31,6 @@ Callback_i::callback_method ( /**/) CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) { @@ -63,7 +60,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback) void Simple_Server_i::callback_object (Callback_ptr callback ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Store the callback object this->callback_ = Callback::_duplicate (callback); @@ -72,7 +68,6 @@ Simple_Server_i::callback_object (Callback_ptr callback void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h index 8456a5240eb..41c91c52b59 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.h @@ -31,12 +31,10 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); // Safe way to shutdown - void callback_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_method (void); // The callback method private: @@ -57,14 +55,11 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Boolean do_callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Boolean do_callback); - void callback_object (Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + void callback_object (Callback_ptr callback); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc index 106dd5900d8..54e3268e74e 100644 --- a/TAO/tests/Big_AMI/Big_AMI.mpc +++ b/TAO/tests/Big_AMI/Big_AMI.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver, messaging, ami { project(*Client): taoserver, messaging, ami { exename = client after += *idl - after += *Server Source_Files { ami_testC.cpp ami_testS.cpp diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp index bfaecaaf55f..064960d0458 100644 --- a/TAO/tests/Big_AMI/ami_test_i.cpp +++ b/TAO/tests/Big_AMI/ami_test_i.cpp @@ -29,7 +29,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l, CORBA::Long in_l, const char* in_str, const A::Payload &) - ACE_THROW_SPEC ((CORBA::SystemException)) { out_l = 931233; @@ -44,7 +43,6 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void AMI_Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Big_AMI/ami_test_i.h b/TAO/tests/Big_AMI/ami_test_i.h index ab16cfdf41f..5bc0b26b3d8 100644 --- a/TAO/tests/Big_AMI/ami_test_i.h +++ b/TAO/tests/Big_AMI/ami_test_i.h @@ -32,11 +32,9 @@ public: CORBA::Long foo (CORBA::Long_out out_l, CORBA::Long in_l, const char* in_str, - const A::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + const A::Payload &the_payload); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index f0903729201..7e99acf658d 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -85,7 +85,6 @@ public: void foo (CORBA::Long ami_return_val, CORBA::Long out_l) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++reply_count_; if (debug) @@ -98,7 +97,6 @@ public: }; void foo_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++reply_count_; diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc index 6ce9fa45d76..2bd69013e64 100644 --- a/TAO/tests/Big_Oneways/Big_Oneways.mpc +++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver { project(*Client): taoexe, portableserver { after += *idl - after += *Server Source_Files { Peer.cpp Session.cpp diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp index 1cad2f4c83d..fcfcb5239d2 100644 --- a/TAO/tests/Big_Oneways/Coordinator.cpp +++ b/TAO/tests/Big_Oneways/Coordinator.cpp @@ -66,7 +66,6 @@ Coordinator::shutdown_all_peers (void) void Coordinator::add_peer (Test::Peer_ptr peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->peer_count_ >= this->peer_max_) return; diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h index 76bd88d5fa8..1f1c19bf448 100644 --- a/TAO/tests/Big_Oneways/Coordinator.h +++ b/TAO/tests/Big_Oneways/Coordinator.h @@ -31,8 +31,7 @@ public: void shutdown_all_peers (void); // = The skeleton methods - virtual void add_peer (Test::Peer_ptr peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void add_peer (Test::Peer_ptr peer); protected: /// Protected Destructor, call _remove_ref() instead diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp index d6d4077ac20..77c338bdb63 100644 --- a/TAO/tests/Big_Oneways/Peer.cpp +++ b/TAO/tests/Big_Oneways/Peer.cpp @@ -21,7 +21,6 @@ Peer::create_session (Test::Session_Control_ptr control, CORBA::ULong thread_count, CORBA::ULong message_count, CORBA::ULong peer_count) - ACE_THROW_SPEC ((CORBA::SystemException)) { Session *session_impl = 0; ACE_NEW_THROW_EX (session_impl, @@ -38,7 +37,6 @@ Peer::create_session (Test::Session_Control_ptr control, void Peer::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, waiting for threads\n")); diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h index 8f2d18e8445..c1c2777cbc4 100644 --- a/TAO/tests/Big_Oneways/Peer.h +++ b/TAO/tests/Big_Oneways/Peer.h @@ -24,10 +24,8 @@ public: CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - CORBA::ULong peer_count) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong peer_count); + virtual void shutdown (void); private: /// Keep a pointer to the ORB to shutdown cleanly diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp index dd7003cb964..75e36862d98 100644 --- a/TAO/tests/Big_Oneways/Session.cpp +++ b/TAO/tests/Big_Oneways/Session.cpp @@ -114,9 +114,6 @@ Session::validate_connections (void) void Session::start (const Test::Session_List &other_sessions) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Already_Running, - Test::No_Peers)) { if (other_sessions.length () == 0) throw Test::No_Peers (); @@ -176,7 +173,6 @@ Session::ping (void) ACE_THROW_SPEC ((CORBA::SystemException)) void Session::receive_payload (const Test::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (the_payload.length () != this->payload_size_) { @@ -218,7 +214,6 @@ Session::receive_payload (const Test::Payload &the_payload) void Session::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Make sure local resources are released @@ -242,7 +237,6 @@ Session::more_work (void) const void Session::terminate (CORBA::Boolean success) - ACE_THROW_SPEC (()) { // Make sure that global resources are released try diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h index 8dc4dcaafab..d34af92249d 100644 --- a/TAO/tests/Big_Oneways/Session.h +++ b/TAO/tests/Big_Oneways/Session.h @@ -35,25 +35,18 @@ public: int svc (void); // = The skeleton methods - virtual void start (const Test::Session_List &other_sessions) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Already_Running, - Test::No_Peers)); + virtual void start (const Test::Session_List &other_sessions); - virtual void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void ping (void); - virtual void receive_payload (const Test::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_payload (const Test::Payload &the_payload); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); private: /// Helper function used to report any problems and destroy local /// resources - void terminate (CORBA::Boolean success) - ACE_THROW_SPEC (()); + void terminate (CORBA::Boolean success); /// Return 1 if all the work in this session has been completed int more_work (void) const; diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp index fdd01686c9d..9c298313d19 100644 --- a/TAO/tests/Big_Oneways/Session_Control.cpp +++ b/TAO/tests/Big_Oneways/Session_Control.cpp @@ -42,7 +42,6 @@ Session_Control::~Session_Control (void) void Session_Control::session_finished (CORBA::Boolean success) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->session_count_ == 0) diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h index 3e12b1df5e1..2da60584c36 100644 --- a/TAO/tests/Big_Oneways/Session_Control.h +++ b/TAO/tests/Big_Oneways/Session_Control.h @@ -26,8 +26,7 @@ public: int all_sessions_finished (void) const; // = The skeleton methods - virtual void session_finished (CORBA::Boolean success) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void session_finished (CORBA::Boolean success); private: /// Synchronize the internal state diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp index 04f7a0f74ee..7a5abeac4be 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.cpp +++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp @@ -15,7 +15,6 @@ Big_Reply_i::~Big_Reply_i (void) Test::Octet_Seq * Big_Reply_i::get_big_reply ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { Test::Octet_Seq_var reply_mesg = new Test::Octet_Seq (this->length_); @@ -27,13 +26,11 @@ Big_Reply_i::get_big_reply ( /**/) void Big_Reply_i::ping ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Big_Reply_i::shutdown ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index 7edf4deb0c8..ce1173b3856 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -32,14 +32,11 @@ public: virtual ~Big_Reply_i (void); // = The skeleton methods - virtual Test::Octet_Seq *get_big_reply (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Test::Octet_Seq *get_big_reply (void); - virtual void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void ping (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Our local ORB ptr diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc index 1e41a5c9274..2e96131b1a6 100644 --- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc +++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl - after += *Server Source_Files { TestC.cpp Client_Task.cpp diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp index 917276b28f4..5fd90304dbc 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp @@ -13,7 +13,6 @@ Payload_Receiver::Payload_Receiver () void Payload_Receiver::more_data (const Test::Payload& payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (payload.length() > 0) { @@ -23,7 +22,6 @@ Payload_Receiver::more_data (const Test::Payload& payload) void Payload_Receiver::sync_none_more_data (const Test::Payload& payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (payload.length() > 0) { diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h index 1aa87ca3735..b401d89d9a8 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h @@ -19,11 +19,9 @@ public: Payload_Receiver (); // = The skeleton methods - virtual void more_data (const Test::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void more_data (const Test::Payload &payload); - virtual void sync_none_more_data (const Test::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sync_none_more_data (const Test::Payload &payload); int count(bool sync_none = false) const; diff --git a/TAO/tests/Big_Twoways/Big_Twoways.mpc b/TAO/tests/Big_Twoways/Big_Twoways.mpc index 6ce9fa45d76..2bd69013e64 100644 --- a/TAO/tests/Big_Twoways/Big_Twoways.mpc +++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver { project(*Client): taoexe, portableserver { after += *idl - after += *Server Source_Files { Peer.cpp Session.cpp diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp index 1cad2f4c83d..fcfcb5239d2 100644 --- a/TAO/tests/Big_Twoways/Coordinator.cpp +++ b/TAO/tests/Big_Twoways/Coordinator.cpp @@ -66,7 +66,6 @@ Coordinator::shutdown_all_peers (void) void Coordinator::add_peer (Test::Peer_ptr peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->peer_count_ >= this->peer_max_) return; diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h index 8aa64f5ceca..9d8ae0fbd92 100644 --- a/TAO/tests/Big_Twoways/Coordinator.h +++ b/TAO/tests/Big_Twoways/Coordinator.h @@ -30,8 +30,7 @@ public: void shutdown_all_peers (void); // = The skeleton methods - virtual void add_peer (Test::Peer_ptr peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void add_peer (Test::Peer_ptr peer); protected: /// Protected destructor, call _remove_ref() to delete diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp index d6d4077ac20..77c338bdb63 100644 --- a/TAO/tests/Big_Twoways/Peer.cpp +++ b/TAO/tests/Big_Twoways/Peer.cpp @@ -21,7 +21,6 @@ Peer::create_session (Test::Session_Control_ptr control, CORBA::ULong thread_count, CORBA::ULong message_count, CORBA::ULong peer_count) - ACE_THROW_SPEC ((CORBA::SystemException)) { Session *session_impl = 0; ACE_NEW_THROW_EX (session_impl, @@ -38,7 +37,6 @@ Peer::create_session (Test::Session_Control_ptr control, void Peer::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, waiting for threads\n")); diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h index 8f2d18e8445..c1c2777cbc4 100644 --- a/TAO/tests/Big_Twoways/Peer.h +++ b/TAO/tests/Big_Twoways/Peer.h @@ -24,10 +24,8 @@ public: CORBA::ULong payload_size, CORBA::ULong thread_count, CORBA::ULong message_count, - CORBA::ULong peer_count) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong peer_count); + virtual void shutdown (void); private: /// Keep a pointer to the ORB to shutdown cleanly diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp index 82d81a0accb..9a176764603 100644 --- a/TAO/tests/Big_Twoways/Session.cpp +++ b/TAO/tests/Big_Twoways/Session.cpp @@ -90,9 +90,6 @@ Session::svc (void) void Session::start (const Test::Session_List &other_sessions) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Already_Running, - Test::No_Peers)) { if (other_sessions.length () == 0) throw Test::No_Peers (); @@ -147,7 +144,6 @@ Session::start (const Test::Session_List &other_sessions) Test::Payload * Session::echo_payload (const Test::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (the_payload.length () != this->payload_size_) { @@ -193,7 +189,6 @@ Session::echo_payload (const Test::Payload &the_payload) void Session::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Make sure local resources are released @@ -217,7 +212,6 @@ Session::more_work (void) const void Session::validate_connections (void) - ACE_THROW_SPEC (()) { const CORBA::ULong session_count = this->other_sessions_.length (); @@ -240,7 +234,6 @@ Session::validate_connections (void) void Session::terminate (CORBA::Boolean success) - ACE_THROW_SPEC (()) { // Make sure that global resources are released try diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h index db3d8aed838..becf16912e8 100644 --- a/TAO/tests/Big_Twoways/Session.h +++ b/TAO/tests/Big_Twoways/Session.h @@ -32,16 +32,11 @@ public: int svc (void); // = The skeleton methods - virtual void start (const Test::Session_List &other_sessions) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Already_Running, - Test::No_Peers)); + virtual void start (const Test::Session_List &other_sessions); - virtual Test::Payload* echo_payload (const Test::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Test::Payload* echo_payload (const Test::Payload &the_payload); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); protected: /// Protected destructor, call _remove_ref() to delete @@ -50,15 +45,13 @@ protected: private: /// Helper function used to report any problems and destroy local /// resources - void terminate (CORBA::Boolean success) - ACE_THROW_SPEC (()); + void terminate (CORBA::Boolean success); /// Return 1 if all the work in this session has been completed int more_work (void) const; /// Validate all the connections - void validate_connections (void) - ACE_THROW_SPEC (()); + void validate_connections (void); private: /// Synchronize the internal state diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp index daedcf24ace..98d2eaaa728 100644 --- a/TAO/tests/Big_Twoways/Session_Control.cpp +++ b/TAO/tests/Big_Twoways/Session_Control.cpp @@ -42,7 +42,6 @@ Session_Control::~Session_Control (void) void Session_Control::session_finished (CORBA::Boolean success) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); if (this->session_count_ == 0) diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h index 3e12b1df5e1..2da60584c36 100644 --- a/TAO/tests/Big_Twoways/Session_Control.h +++ b/TAO/tests/Big_Twoways/Session_Control.h @@ -26,8 +26,7 @@ public: int all_sessions_finished (void) const; // = The skeleton methods - virtual void session_finished (CORBA::Boolean success) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void session_finished (CORBA::Boolean success); private: /// Synchronize the internal state diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp index cfd9e6876eb..c6e032fb953 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp @@ -14,7 +14,6 @@ Blocking_Sync_None::Blocking_Sync_None (CORBA::ORB_ptr orb) void Blocking_Sync_None::slow_operation (const Test::Payload &, CORBA::ULong sleep_microseconds) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value sleep_time (0, sleep_microseconds); ACE_OS::sleep (sleep_time); @@ -22,7 +21,6 @@ Blocking_Sync_None::slow_operation (const Test::Payload &, void Blocking_Sync_None::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h index 293f76eedb3..9a6f109ae8a 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h @@ -18,11 +18,9 @@ public: // = The skeleton methods virtual void slow_operation (const Test::Payload &the_payload, - CORBA::ULong sleep_microseconds) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong sleep_microseconds); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc index 9bdc2b936c5..655e5e0f012 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl - after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc index e34a19f5abc..8679ec7077d 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc +++ b/TAO/tests/Bug_1020_Basic_Regression/Bug_1020_Basic_Regression.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl - after += *Server Source_Files { Echo.cpp Client_Task.cpp diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp index 4be8b6bf261..7a300a5db2e 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.cpp @@ -13,7 +13,6 @@ Echo::Echo(CORBA::ORB_ptr orb, void Echo::echo_payload (Test::Payload &) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo.h b/TAO/tests/Bug_1020_Basic_Regression/Echo.h index 7a15abb76a1..55aed2b36df 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo.h @@ -18,8 +18,7 @@ public: Echo (CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload & data) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void echo_payload (Test::Payload & data); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp index 15363bf0055..dc26aa8804e 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp @@ -12,7 +12,6 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) void Echo_Caller::start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)) { Server_Task task (client, 32768); @@ -32,7 +31,6 @@ Echo_Caller::start_task(Test::Echo_ptr client) void Echo_Caller::shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); orb_->shutdown(0); diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h index e1982629dc8..eac4bf0c266 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h @@ -15,11 +15,9 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller (CORBA::ORB_ptr orb); - virtual void start_task (Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void start_task (Test::Echo_ptr client); - virtual void shutdown (void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1020_Regression/Echo.cpp b/TAO/tests/Bug_1020_Regression/Echo.cpp index 17b6386b824..17ffaf51fbf 100644 --- a/TAO/tests/Bug_1020_Regression/Echo.cpp +++ b/TAO/tests/Bug_1020_Regression/Echo.cpp @@ -17,7 +17,6 @@ Echo::Echo(CORBA::ORB_ptr orb) Test::Payload * Echo::echo_payload(Test::Payload const &) - ACE_THROW_SPEC((CORBA::SystemException)) { ACE_Time_Value tick(0, 10000); orb_->run(tick); diff --git a/TAO/tests/Bug_1020_Regression/Echo.h b/TAO/tests/Bug_1020_Regression/Echo.h index 33bac647e08..3674cb8474a 100644 --- a/TAO/tests/Bug_1020_Regression/Echo.h +++ b/TAO/tests/Bug_1020_Regression/Echo.h @@ -15,8 +15,7 @@ class Echo : public POA_Test::Echo public: Echo(CORBA::ORB_ptr orb); - virtual Test::Payload * echo_payload (Test::Payload const & data) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual Test::Payload * echo_payload (Test::Payload const & data); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp index 1719e29eaf2..ef35acd35b9 100644 --- a/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp +++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.cpp @@ -17,7 +17,6 @@ Echo_Callback::Echo_Callback() void Echo_Callback::echo_payload(Test::Payload const & TAO_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC((CORBA::SystemException)) { static int n = 0; n++; @@ -31,6 +30,5 @@ Echo_Callback::echo_payload(Test::Payload const & void Echo_Callback::echo_payload_excep(Test::AMI_EchoExceptionHolder * TAO_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC((CORBA::SystemException)) { } diff --git a/TAO/tests/Bug_1020_Regression/Echo_Callback.h b/TAO/tests/Bug_1020_Regression/Echo_Callback.h index b70effe7c0c..f0b85c24751 100644 --- a/TAO/tests/Bug_1020_Regression/Echo_Callback.h +++ b/TAO/tests/Bug_1020_Regression/Echo_Callback.h @@ -15,10 +15,8 @@ class Echo_Callback : public POA_Test::AMI_EchoHandler public: Echo_Callback(); - virtual void echo_payload (Test::Payload const & ami_return_val) - ACE_THROW_SPEC((CORBA::SystemException)); - virtual void echo_payload_excep (Test::AMI_EchoExceptionHolder * excep_holder) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void echo_payload (Test::Payload const & ami_return_val); + virtual void echo_payload_excep (Test::AMI_EchoExceptionHolder * excep_holder); }; #endif /* Echo__h_ */ diff --git a/TAO/tests/Bug_1020_Regression/Server_i.cpp b/TAO/tests/Bug_1020_Regression/Server_i.cpp index 5cc24c66548..b8d26e2843a 100644 --- a/TAO/tests/Bug_1020_Regression/Server_i.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_i.cpp @@ -11,7 +11,6 @@ Server::Server(CORBA::ORB_ptr orb) void Server::start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)) { Server_Task * task = new Server_Task(client); diff --git a/TAO/tests/Bug_1020_Regression/Server_i.h b/TAO/tests/Bug_1020_Regression/Server_i.h index b2f1e875701..66175e62db1 100644 --- a/TAO/tests/Bug_1020_Regression/Server_i.h +++ b/TAO/tests/Bug_1020_Regression/Server_i.h @@ -16,8 +16,7 @@ class Server : public POA_Test::Server public: Server(CORBA::ORB_ptr orb); - virtual void start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void start_task(Test::Echo_ptr client); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp index 3fbc4fdaa62..419ad646a44 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp +++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp @@ -16,9 +16,6 @@ BlobServerImpl::test( BlobType1& blob1, BlobType2& blob2 ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { blob1.length(10); for(int i = 0; i < 10; i++) @@ -35,7 +32,6 @@ BlobServerImpl::test( void BlobServerImpl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h index 54eeb3bfdd8..01e568a32c5 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.h +++ b/TAO/tests/Bug_1254_Regression/BlobServer.h @@ -19,12 +19,8 @@ public: virtual void test( BlobType1& blob1, BlobType2& blob2 - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); + virtual void shutdown (void); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc index 86c800e8fef..2847b187410 100644 --- a/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc +++ b/TAO/tests/Bug_1254_Regression/Bug_1254_Regression.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver { project(*Client): taoserver { exename = client after += *idl - after += *Server Source_Files { client.cpp testC.cpp diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc index 1a4a34003bc..766e26c6e94 100644 --- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc +++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl - after += *Server Source_Files { Echo.cpp client.cpp diff --git a/TAO/tests/Bug_1269_Regression/Echo.cpp b/TAO/tests/Bug_1269_Regression/Echo.cpp index 32009b9c996..d64dae69dce 100644 --- a/TAO/tests/Bug_1269_Regression/Echo.cpp +++ b/TAO/tests/Bug_1269_Regression/Echo.cpp @@ -20,7 +20,6 @@ Echo::Echo(CORBA::ORB_ptr orb, void Echo::echo_payload(Test::Payload const &) - ACE_THROW_SPEC((CORBA::SystemException)) { this->abort_counter_--; diff --git a/TAO/tests/Bug_1269_Regression/Echo.h b/TAO/tests/Bug_1269_Regression/Echo.h index 676c856d3b1..74f2e13f2f3 100644 --- a/TAO/tests/Bug_1269_Regression/Echo.h +++ b/TAO/tests/Bug_1269_Regression/Echo.h @@ -16,8 +16,7 @@ public: Echo(CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload const & data) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void echo_payload (Test::Payload const & data); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp index a9fcb25f53c..1bc987dda57 100644 --- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp @@ -19,7 +19,6 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) void Echo_Caller::start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)) { Server_Timer * task = new Server_Timer(client, orb_->orb_core()->reactor()); @@ -32,7 +31,6 @@ Echo_Caller::start_task(Test::Echo_ptr client) void Echo_Caller::shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); orb_->shutdown(0); diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.h b/TAO/tests/Bug_1269_Regression/Echo_Caller.h index 3a62bc0d88e..6994e7c65af 100644 --- a/TAO/tests/Bug_1269_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.h @@ -15,11 +15,9 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller(CORBA::ORB_ptr orb); - virtual void start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void start_task(Test::Echo_ptr client); - virtual void shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void shutdown(void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc index a594a344e69..02d77667b22 100644 --- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc +++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl - after += *Server Source_Files { Echo.cpp client.cpp @@ -36,7 +35,6 @@ project(*Client): taoclient, messaging { project(*Shutdown): taoexe, messaging { after += *idl - after += *Client Source_Files { shutdown.cpp TestC.cpp diff --git a/TAO/tests/Bug_1270_Regression/Echo.cpp b/TAO/tests/Bug_1270_Regression/Echo.cpp index b41ec6256ab..d9c971f82e3 100644 --- a/TAO/tests/Bug_1270_Regression/Echo.cpp +++ b/TAO/tests/Bug_1270_Regression/Echo.cpp @@ -20,7 +20,6 @@ Echo::Echo(CORBA::ORB_ptr orb, void Echo::echo_payload(Test::Payload const &) - ACE_THROW_SPEC((CORBA::SystemException)) { this->abort_counter_--; diff --git a/TAO/tests/Bug_1270_Regression/Echo.h b/TAO/tests/Bug_1270_Regression/Echo.h index 5e835b6396a..d27ad1508a7 100644 --- a/TAO/tests/Bug_1270_Regression/Echo.h +++ b/TAO/tests/Bug_1270_Regression/Echo.h @@ -18,8 +18,7 @@ public: Echo(CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload const & data) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void echo_payload (Test::Payload const & data); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp index bf42f0b83d5..e49c9c4c970 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp @@ -19,7 +19,6 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb) void Echo_Caller::start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)) { Server_Timer * task = new Server_Timer(client, orb_->orb_core()->reactor()); @@ -32,7 +31,6 @@ Echo_Caller::start_task(Test::Echo_ptr client) void Echo_Caller::shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); orb_->shutdown(0); diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h index e2a476e4052..f0fb687d956 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h @@ -16,11 +16,9 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller(CORBA::ORB_ptr orb); - virtual void start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void start_task(Test::Echo_ptr client); - virtual void shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void shutdown(void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc index 803bdf58c37..d4952cef96b 100644 --- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc +++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver, iortable { project(*Client): taoclient, anytypecode { after += *idl - after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp index fee6cd16303..ff714f3bbd6 100644 --- a/TAO/tests/Bug_1330_Regression/Test_i.cpp +++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp @@ -15,7 +15,6 @@ Test_i::~Test_i() void Test_i::test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Noop } diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h index e87b72d2120..7c5d11c210e 100644 --- a/TAO/tests/Bug_1330_Regression/Test_i.h +++ b/TAO/tests/Bug_1330_Regression/Test_i.h @@ -18,8 +18,7 @@ public: ~Test_i (void); /// A method - void test_method(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method(void); }; diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc index 3e3ececcc65..0dc5224babf 100644 --- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc +++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl - after += *Server Source_Files { Echo.cpp ORB_Task.cpp @@ -38,7 +37,6 @@ project(*Client): taoclient, messaging { project(*Shutdown): taoexe, messaging { after += *idl - after += *Client Source_Files { shutdown.cpp TestC.cpp diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp index bc304e7b283..b5a151a1852 100644 --- a/TAO/tests/Bug_1361_Regression/Echo.cpp +++ b/TAO/tests/Bug_1361_Regression/Echo.cpp @@ -21,7 +21,6 @@ Echo::Echo(CORBA::ORB_ptr orb, void Echo::echo_payload(Test::Payload const &) - ACE_THROW_SPEC((CORBA::SystemException)) { this->abort_counter_--; @@ -36,9 +35,6 @@ Echo::echo_payload(Test::Payload const &) void Echo::echo_payload_out ( Test::Payload_out data) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { int j = ACE_OS::rand() % 40000; data = new Test::Payload(j); diff --git a/TAO/tests/Bug_1361_Regression/Echo.h b/TAO/tests/Bug_1361_Regression/Echo.h index 3a37b02023d..59e08d6b754 100644 --- a/TAO/tests/Bug_1361_Regression/Echo.h +++ b/TAO/tests/Bug_1361_Regression/Echo.h @@ -19,15 +19,11 @@ public: Echo(CORBA::ORB_ptr orb, int abort_counter); - virtual void echo_payload (Test::Payload const & data) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void echo_payload (Test::Payload const & data); virtual void echo_payload_out ( Test::Payload_out data - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp index 4e20b1ece10..1ae9fbefd7b 100644 --- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp @@ -21,14 +21,12 @@ Echo_Caller::Echo_Caller(CORBA::ORB_ptr orb, Thread_Pool *pool) void Echo_Caller::start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)) { pool_->put(Test::Echo::_duplicate(client)); } void Echo_Caller::shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); orb_->shutdown(0); diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.h b/TAO/tests/Bug_1361_Regression/Echo_Caller.h index c0551d40b4d..787e37196f7 100644 --- a/TAO/tests/Bug_1361_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.h @@ -18,11 +18,9 @@ class Echo_Caller : public POA_Test::Echo_Caller public: Echo_Caller(CORBA::ORB_ptr orb, Thread_Pool *pool_); - virtual void start_task(Test::Echo_ptr client) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void start_task(Test::Echo_ptr client); - virtual void shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void shutdown(void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc index 7fecacc059b..5dc0408c587 100644 --- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc +++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, messaging { after += *idl - after += *Server Source_Files { Client_Task.cpp Server_Task.cpp diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp index 311fba07133..142e4e6e2c5 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp +++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp @@ -15,7 +15,6 @@ Sender_i::~Sender_i (void) void Sender_i::active_objects (CORBA::ULong no_threads) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->active_objects_ = no_threads; } @@ -23,7 +22,6 @@ Sender_i::active_objects (CORBA::ULong no_threads) void Sender_i::send_ready_message (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Received a call ...\n")); diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h index 08a78a7e74d..d600e7a32e0 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.h +++ b/TAO/tests/Bug_1476_Regression/Sender_i.h @@ -32,11 +32,9 @@ public: virtual ~Sender_i (void); // = The skeleton methods - virtual void active_objects (CORBA::ULong ao) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void active_objects (CORBA::ULong ao); - virtual void send_ready_message (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_ready_message (void); CORBA::ULong get_number_received (void) const; diff --git a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc index aa7e626cec2..21caa76af8d 100644 --- a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc +++ b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, amh, ami, iortable, portableserver { project(*Client): taoserver, amh, ami { exename = client after += *idl - after += *Server Source_Files { Client_Task.cpp Reply_Handler.cpp diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp index 6575cb0bdca..c08ad59c653 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.cpp +++ b/TAO/tests/Bug_1482_Regression/Hello.cpp @@ -19,7 +19,6 @@ Hello::Hello (CORBA::ORB_ptr orb) CORBA::ULong Hello::next_prime (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h index 7d7fe72e65a..0230d9b4da6 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.h +++ b/TAO/tests/Bug_1482_Regression/Hello.h @@ -17,8 +17,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong next_prime (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong next_prime (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp index cac4a472529..a7a6aaa7236 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp @@ -8,7 +8,6 @@ Reply_Handler::Reply_Handler (CORBA::ORB_ptr o) void Reply_Handler::next_prime (CORBA::ULong) - ACE_THROW_SPEC ((CORBA::SystemException)) { return; } @@ -16,7 +15,6 @@ Reply_Handler::next_prime (CORBA::ULong) void Reply_Handler::next_prime_excep ( ::Messaging::ExceptionHolder *ex) - ACE_THROW_SPEC ((CORBA::SystemException)) { try diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.h b/TAO/tests/Bug_1482_Regression/Reply_Handler.h index 4b59d67cef0..3c9c25afd9b 100644 --- a/TAO/tests/Bug_1482_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1482_Regression/Reply_Handler.h @@ -14,11 +14,9 @@ public: Reply_Handler (CORBA::ORB_ptr o); - void next_prime (CORBA::ULong ami_return_val) - ACE_THROW_SPEC ((CORBA::SystemException)); + void next_prime (CORBA::ULong ami_return_val); - void next_prime_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + void next_prime_excep (::Messaging::ExceptionHolder * excep_holder); private: diff --git a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc index 15cb99367e1..a1d2b35a529 100644 --- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc +++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc @@ -25,7 +25,6 @@ project(*Server): taoserver, pi_server, interceptors { project(*Client): taoserver, pi, interceptors { exename = client after += *idl - after += *Server Source_Files { test_i.cpp testC.cpp diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp index b9afd9b4960..9c1054f4ec9 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp @@ -15,7 +15,6 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No Op } @@ -23,7 +22,6 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h index c232ee05e1a..9850870f124 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp index 132b2dd7568..5c484b8b253 100644 --- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp @@ -15,7 +15,6 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No Op } @@ -23,7 +22,6 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Install the Echo server request interceptor ACE_NEW_THROW_EX (this->server_interceptor_, diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h index ee240056609..b6bbbd44b78 100644 --- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h +++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h @@ -33,11 +33,9 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp index 926acd7cc13..d3c8aee2c01 100644 --- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp @@ -25,21 +25,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -47,8 +44,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_UNUSED_ARG (ri); // No Op @@ -57,7 +52,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG (ri); // No Op @@ -66,8 +60,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_UNUSED_ARG (ri); // no op @@ -76,8 +68,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // No op ACE_UNUSED_ARG (ri); diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h index 705bce07974..8e8ec520789 100644 --- a/TAO/tests/Bug_1495_Regression/client_interceptor.h +++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h @@ -31,30 +31,20 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (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 receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp index 7767288eba5..d3709f062d7 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp @@ -30,7 +30,6 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) void Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (forward_location)) throw CORBA::INV_OBJREF ( @@ -43,22 +42,18 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -89,8 +84,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -98,7 +91,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { // No op ACE_UNUSED_ARG (ri); @@ -107,8 +99,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // No Op ACE_UNUSED_ARG (ri); @@ -117,8 +107,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // This will throw an exception if a location forward has not diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h index dfcbae7b2c2..dd1814cd281 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.h +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h @@ -33,35 +33,23 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - void forward_reference (CORBA::Object_ptr forward_location) - ACE_THROW_SPEC ((CORBA::SystemException)); + void forward_reference (CORBA::Object_ptr forward_location); - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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); bool forward_location_done() const; private: diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp index 64f9a568282..4fb3af77422 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.cpp +++ b/TAO/tests/Bug_1495_Regression/test_i.cpp @@ -29,9 +29,6 @@ void Bug1495_i::get_thread_id ( CORBA::Long_out thread_id ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { thread_id = (CORBA::Long)ACE_Thread::self(); } @@ -39,9 +36,6 @@ Bug1495_i::get_thread_id ( void Bug1495_i::shutdown ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG ((LM_INFO, "Shutting down orb %i\n", diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h index 146a65f5c07..709ef8be74d 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.h +++ b/TAO/tests/Bug_1495_Regression/test_i.h @@ -50,12 +50,10 @@ public: virtual ~Bug1495_i (void); virtual - void get_thread_id (CORBA::Long_out thread_id) - ACE_THROW_SPEC ((CORBA::SystemException)); + void get_thread_id (CORBA::Long_out thread_id); virtual - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_ptr orb_; diff --git a/TAO/tests/Bug_1535_Regression/Test.cpp b/TAO/tests/Bug_1535_Regression/Test.cpp index 55daf8fcfc4..00399f096ea 100644 --- a/TAO/tests/Bug_1535_Regression/Test.cpp +++ b/TAO/tests/Bug_1535_Regression/Test.cpp @@ -12,7 +12,6 @@ Hello::Hello (PortableServer::POA_ptr poa) : void Hello::print_hello_world (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Bug_1535_Regression/Test.h b/TAO/tests/Bug_1535_Regression/Test.h index 42bccb4ce91..df13c104c11 100644 --- a/TAO/tests/Bug_1535_Regression/Test.h +++ b/TAO/tests/Bug_1535_Regression/Test.h @@ -16,8 +16,7 @@ public: Hello (PortableServer::POA_ptr poa); // = The skeleton methods - virtual void print_hello_world (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void print_hello_world (void); PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc index 676093874cc..22cdec6aa4c 100644 --- a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc +++ b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, ami, iortable { project(*Client): taoserver, ami { exename = client after += *idl - after += *Server Source_Files { Client_Task.cpp Reply_Handler.cpp diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp index bf29d0f14e3..7dc579f2fbc 100644 --- a/TAO/tests/Bug_1551_Regression/Hello.cpp +++ b/TAO/tests/Bug_1551_Regression/Hello.cpp @@ -16,7 +16,6 @@ Hello::Hello( void Hello::short_sleep (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { long count = atomic_counter_--; diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h index 9378352de1e..01fa3c62a42 100644 --- a/TAO/tests/Bug_1551_Regression/Hello.h +++ b/TAO/tests/Bug_1551_Regression/Hello.h @@ -16,8 +16,7 @@ public: /// Constructor Hello(CORBA::ORB_ptr orb, bool simulate_crashes); - virtual void short_sleep (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void short_sleep (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp index aa2959f4104..88e34505a96 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp @@ -16,7 +16,6 @@ Reply_Handler::Reply_Handler ( void Reply_Handler::short_sleep (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { check_counter(); @@ -29,7 +28,6 @@ Reply_Handler::short_sleep (void) void Reply_Handler::short_sleep_excep ( ::Messaging::ExceptionHolder *ex) - ACE_THROW_SPEC ((CORBA::SystemException)) { check_counter(); diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h index 7ff901d9d20..4617c5ea5c5 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h @@ -17,11 +17,9 @@ public: Test::Hello_ptr hello, CORBA::ORB_ptr orb); - void short_sleep (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void short_sleep (void); - void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder); private: void check_counter(void); diff --git a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc index 579c46280fa..aad2d3ed710 100644 --- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc +++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver, amh { project(*Client): taoserver, amh { after += *idl - after += *Server exename = client Source_Files { client.cpp diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp index 7c8870a3cb2..e0c699b225b 100644 --- a/TAO/tests/Bug_1568_Regression/server.cpp +++ b/TAO/tests/Bug_1568_Regression/server.cpp @@ -28,17 +28,13 @@ public: Simple_C (CORBA::ORB_ptr orb); void op1 ( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh); void op2 ( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh); void op3 ( - Foo::Bar::AMH_BResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + Foo::Bar::AMH_BResponseHandler_ptr _tao_rh); void op4 ( - Baz::AMH_CResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + Baz::AMH_CResponseHandler_ptr _tao_rh); protected: CORBA::ORB_ptr orb_; @@ -56,7 +52,6 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb) void Simple_C::op1( Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op1(); } @@ -64,7 +59,6 @@ Simple_C::op1( void Simple_C::op2( Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op2(); } @@ -72,7 +66,6 @@ Simple_C::op2( void Simple_C::op3( Foo::Bar::AMH_BResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op3(); } @@ -80,7 +73,6 @@ Simple_C::op3( void Simple_C::op4( Baz::AMH_CResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op4(); } diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc index 19a373b79c9..3dc626dd384 100644 --- a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc +++ b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver, iortable { project(*Client): taoclient, anytypecode { after += *idl - after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_1627_Regression/Test_i.cpp b/TAO/tests/Bug_1627_Regression/Test_i.cpp index fee6cd16303..ff714f3bbd6 100644 --- a/TAO/tests/Bug_1627_Regression/Test_i.cpp +++ b/TAO/tests/Bug_1627_Regression/Test_i.cpp @@ -15,7 +15,6 @@ Test_i::~Test_i() void Test_i::test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Noop } diff --git a/TAO/tests/Bug_1627_Regression/Test_i.h b/TAO/tests/Bug_1627_Regression/Test_i.h index 369ae33b782..94bf9373017 100644 --- a/TAO/tests/Bug_1627_Regression/Test_i.h +++ b/TAO/tests/Bug_1627_Regression/Test_i.h @@ -18,8 +18,7 @@ public: ~Test_i (void); /// A method - void test_method(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method(void); }; #endif /* ! BUG_1330_REGRESSION_TEST_I_H */ diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc index a7ebd6af44a..1fe63298c85 100644 --- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc +++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, amh { project(*Client): taoserver, amh { exename = client after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp index a13ae191aed..886f4da7e2b 100644 --- a/TAO/tests/Bug_1670_Regression/server.cpp +++ b/TAO/tests/Bug_1670_Regression/server.cpp @@ -28,17 +28,13 @@ public: Simple_C (CORBA::ORB_ptr orb); void op1 ( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh); void op2 ( - Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + Foo::Bar::AMH_AResponseHandler_ptr _tao_rh); void op3 ( - Foo::Bar::AMH_BResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + Foo::Bar::AMH_BResponseHandler_ptr _tao_rh); void op4 ( - Baz::AMH_CResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)); + Baz::AMH_CResponseHandler_ptr _tao_rh); protected: CORBA::ORB_ptr orb_; @@ -56,7 +52,6 @@ Simple_C::Simple_C (CORBA::ORB_ptr orb) void Simple_C::op1( Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op1(1); } @@ -64,7 +59,6 @@ Simple_C::op1( void Simple_C::op2( Foo::Bar::AMH_AResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op2(2); } @@ -72,7 +66,6 @@ Simple_C::op2( void Simple_C::op3( Foo::Bar::AMH_BResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op3(3); } @@ -80,7 +73,6 @@ Simple_C::op3( void Simple_C::op4( Baz::AMH_CResponseHandler_ptr _tao_rh) - ACE_THROW_SPEC ((CORBA::SystemException)) { _tao_rh->op4(4); } diff --git a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc index a2357ad295c..e2fbcdc3d00 100644 --- a/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc +++ b/TAO/tests/Bug_1676_Regression/Bug_1676_Regression.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver { project(*Client): taoclient { after += *idl - after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp index 6e120fe9bbd..07dfbcf6ac6 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.cpp +++ b/TAO/tests/Bug_1676_Regression/Hello.cpp @@ -13,7 +13,6 @@ Hello::Hello (CORBA::ORB_ptr orb) #if 0 char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } @@ -23,9 +22,6 @@ Hello::get_string (void) Hello::get_stringList ( // ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { Test::StringList * seq; ACE_NEW_RETURN (seq, @@ -47,9 +43,6 @@ Hello::get_stringList2 ( ::CORBA::Boolean initialize, ::Test::StringList_out osl ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { // CORBA::String_var the_string = osl->length(); // ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Entering get_stringList2(%.4d)\n", osl)); @@ -72,9 +65,6 @@ void Hello::mod_stringList ( ::Test::StringList & iosl ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { // osl->length(10); for (CORBA::ULong i = 0; i<iosl.length(); i++) @@ -89,7 +79,6 @@ Hello::mod_stringList ( void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h index dc3314a876c..6c20db104e5 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.h +++ b/TAO/tests/Bug_1676_Regression/Hello.h @@ -18,28 +18,18 @@ public: // = The skeleton methods virtual ::Test::StringList * get_stringList ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); virtual void get_stringList2 ( ::CORBA::Boolean initialize, ::Test::StringList_out osl - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); virtual void mod_stringList ( ::Test::StringList & iosl - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc index 7bb66c7b450..43315056a45 100644 --- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc +++ b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc @@ -21,7 +21,6 @@ project(*Server): taoserver, iortable, ami { project(*Client): taoclient, ami { after += *idl - after += *Server Source_Files { client.cpp AMIC.cpp diff --git a/TAO/tests/Bug_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp index b34fc2fa70c..efdb735b6db 100644 --- a/TAO/tests/Bug_1869_Regression/client.cpp +++ b/TAO/tests/Bug_1869_Regression/client.cpp @@ -17,9 +17,6 @@ class AdderCallback virtual void add ( CORBA::Long ami_return_val ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG ((LM_DEBUG, "Return value: %d\n", ami_return_val)); } @@ -27,9 +24,6 @@ class AdderCallback virtual void add_excep ( ::Messaging::ExceptionHolder * ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG ((LM_DEBUG, "Caught exception in _excep\n")); } diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp index 6b741d07984..40bb68174be 100644 --- a/TAO/tests/Bug_1869_Regression/server.cpp +++ b/TAO/tests/Bug_1869_Regression/server.cpp @@ -16,9 +16,7 @@ public: CORBA::Long a, CORBA::Long b ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { + { return a + b; } }; diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp index ff95b9d3da6..ec177a6d242 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.cpp +++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp @@ -15,7 +15,6 @@ EventNode::EventNode (CORBA::ORB_ptr orb, } void EventNode::registerHello ( ::Test::Hello_ptr h ) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) EventNode: registerHello will call get_string...\n")); @@ -54,7 +53,6 @@ void EventNode::registerHello ( ::Test::Hello_ptr h ) void EventNode::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h index 328da040c9e..e39deb0e464 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.h +++ b/TAO/tests/Bug_2084_Regression/EventNode.h @@ -20,11 +20,9 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual void registerHello ( ::Test::Hello_ptr h) - ACE_THROW_SPEC (( CORBA::SystemException)); + virtual void registerHello ( ::Test::Hello_ptr h); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp index ffc76400566..48c791c1929 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.cpp +++ b/TAO/tests/Bug_2084_Regression/Hello.cpp @@ -16,7 +16,6 @@ ACE_RCSID(Hello, Hello, "$Id$") char * Hello::get_string (::CORBA::Long caller_threadid) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -58,7 +57,6 @@ Hello::get_string (::CORBA::Long caller_threadid) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h index 6ea9baac96d..e5606bf00b1 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.h +++ b/TAO/tests/Bug_2084_Regression/Hello.h @@ -20,11 +20,9 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string ( ::CORBA::Long caller_threadid ) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string ( ::CORBA::Long caller_threadid ); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc index fed64e9b29a..9a3a20707ae 100644 --- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc +++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver { project(*Client): taoclient, anytypecode, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += *idl - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp index 8efe0fe94f0..ee0a7d02adc 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.cpp +++ b/TAO/tests/Bug_2174_Regression/test_i.cpp @@ -15,7 +15,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) CORBA::Long Simple_Server_i::echo (CORBA::Long x, CORBA::Long msecs) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000); @@ -28,7 +27,6 @@ Simple_Server_i::echo (CORBA::Long x, void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h index 8a135bdd767..8c102e3a1b7 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.h +++ b/TAO/tests/Bug_2174_Regression/test_i.h @@ -32,10 +32,8 @@ public: // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, - CORBA::Long msecs) - ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long msecs); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc index d4c612baee2..41d5b8dfa81 100644 --- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc +++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver, strategies { project(*Client): taoclient, anytypecode { after += *idl - after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp index d9a502753b9..ee93d6507bb 100644 --- a/TAO/tests/Bug_2183_Regression/Hello.cpp +++ b/TAO/tests/Bug_2183_Regression/Hello.cpp @@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h index 78833d61a97..76d00d09df0 100644 --- a/TAO/tests/Bug_2183_Regression/Hello.h +++ b/TAO/tests/Bug_2183_Regression/Hello.h @@ -22,11 +22,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc index 874a0bb77df..efde33e3d93 100644 --- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc +++ b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, strategies { project(*Client): taoserver, strategies { after += *idl - after += *Server exename = client Source_Files { Hello.cpp diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp index 78f86cba94b..e776306b641 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.cpp +++ b/TAO/tests/Bug_2186_Regression/Hello.cpp @@ -12,7 +12,6 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Received call back !!!\n")); return CORBA::string_dup ("Hello there!"); @@ -20,14 +19,12 @@ Hello::get_string (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } void Hello::request_callback (Test::Hello_ptr call_me) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Making call back !!!\n")); try diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h index 177070074eb..59e72ed2695 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.h +++ b/TAO/tests/Bug_2186_Regression/Hello.h @@ -17,14 +17,11 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); - virtual void request_callback (Test::Hello_ptr call_me) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void request_callback (Test::Hello_ptr call_me); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Bug_2188_Regression/broken.mpc b/TAO/tests/Bug_2188_Regression/broken.mpc index dbcd24841bb..cd6b7d77bc3 100644 --- a/TAO/tests/Bug_2188_Regression/broken.mpc +++ b/TAO/tests/Bug_2188_Regression/broken.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver { project(*Client): taoclient { after += *idl - after += *Server Source_Files { brokenC.cpp client.cpp diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp index 24a80a371e6..c23ce9d86ba 100644 --- a/TAO/tests/Bug_2188_Regression/broken_i.cpp +++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp @@ -43,14 +43,12 @@ ServerAdmin_i::~ServerAdmin_i (void) ArrayTest_ptr ServerAdmin_i::target(void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ArrayTest::_duplicate(target_.in()); } void ServerAdmin_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { int argc = 0; char ** argv = 0; @@ -101,9 +99,6 @@ ArrayTest_i::~ArrayTest_i (void) ::LongArray p2, ::LongArray_out p3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ::LongArray_copy(p3,p2); return LongArray_dup(p1); @@ -114,9 +109,6 @@ ArrayTest_i::~ArrayTest_i (void) ::StringArray p2, ::StringArray_out p3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here ::StringArray_copy(p3,p2); @@ -128,9 +120,6 @@ ArrayTest_i::~ArrayTest_i (void) ::ShortArray p2, ::ShortArray_out p3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ::ShortArray_copy(p3,p2); return ShortArray_dup(p1); @@ -142,9 +131,6 @@ ArrayTest_i::~ArrayTest_i (void) ::UShortArray p2, ::UShortArray_out p3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here ::UShortArray_copy(p3,p2); @@ -156,9 +142,6 @@ ArrayTest_i::~ArrayTest_i (void) ::CharArray p2, ::CharArray_out p3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here ::CharArray_copy(p3,p2); @@ -171,9 +154,6 @@ ArrayTest_i::~ArrayTest_i (void) ::OctetArray p2, ::OctetArray_out p3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here ::OctetArray_copy(p3,p2); @@ -185,9 +165,6 @@ ArrayTest_i::~ArrayTest_i (void) ::DoubleArray p2, ::DoubleArray_out p3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here ::DoubleArray_copy(p3,p2); @@ -197,9 +174,6 @@ ArrayTest_i::~ArrayTest_i (void) ::LongArray_slice * ArrayTest_i::a_longArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return LongArray_dup(longArray_); @@ -208,9 +182,6 @@ ArrayTest_i::~ArrayTest_i (void) void ArrayTest_i::a_longArray ( const ::LongArray a_longArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here LongArray_copy(longArray_,a_longArray); @@ -219,9 +190,6 @@ void ArrayTest_i::a_longArray ( ::ULongArray_slice * ArrayTest_i::a_ulongArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return ULongArray_dup(ulongArray_); @@ -230,9 +198,6 @@ void ArrayTest_i::a_longArray ( void ArrayTest_i::a_ulongArray ( const ::ULongArray a_ulongArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here ULongArray_copy (ulongArray_,a_ulongArray); @@ -241,9 +206,6 @@ void ArrayTest_i::a_ulongArray ( ::StringArray_slice * ArrayTest_i::a_stringArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return StringArray_dup (stringArray_); @@ -252,9 +214,6 @@ void ArrayTest_i::a_ulongArray ( void ArrayTest_i::a_stringArray ( const ::StringArray a_stringArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here StringArray_copy (stringArray_,a_stringArray); @@ -263,9 +222,6 @@ void ArrayTest_i::a_stringArray ( ::ShortArray_slice * ArrayTest_i::a_shortArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return ShortArray_dup (shortArray_); @@ -274,9 +230,6 @@ void ArrayTest_i::a_stringArray ( void ArrayTest_i::a_shortArray ( const ::ShortArray a_shortArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here ShortArray_copy (shortArray_,a_shortArray); @@ -285,9 +238,6 @@ void ArrayTest_i::a_shortArray ( ::UShortArray_slice * ArrayTest_i::a_ushortArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return UShortArray_dup (ushortArray_); @@ -296,9 +246,6 @@ void ArrayTest_i::a_shortArray ( void ArrayTest_i::a_ushortArray ( const ::UShortArray a_ushortArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here UShortArray_copy (ushortArray_,a_ushortArray); @@ -307,9 +254,6 @@ void ArrayTest_i::a_ushortArray ( CORBA::Char ArrayTest_i::a_char ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return char_; @@ -318,9 +262,6 @@ CORBA::Char ArrayTest_i::a_char ( void ArrayTest_i::a_char ( ::CORBA::Char a_char ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here char_ = a_char; @@ -329,9 +270,6 @@ void ArrayTest_i::a_char ( ::CharArray_slice * ArrayTest_i::a_charArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CharArray_dup (charArray_); } @@ -339,9 +277,6 @@ void ArrayTest_i::a_char ( void ArrayTest_i::a_charArray ( const ::CharArray a_charArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here CharArray_copy (charArray_,a_charArray); @@ -350,9 +285,6 @@ void ArrayTest_i::a_charArray ( ::OctetArray_slice * ArrayTest_i::a_octetArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return OctetArray_dup (octetArray_); @@ -361,9 +293,6 @@ void ArrayTest_i::a_charArray ( void ArrayTest_i::a_octetArray ( const ::OctetArray a_octetArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here OctetArray_copy (octetArray_,a_octetArray); @@ -372,9 +301,6 @@ void ArrayTest_i::a_octetArray ( ::DoubleArray_slice * ArrayTest_i::a_doubleArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return DoubleArray_dup (doubleArray_); @@ -383,9 +309,6 @@ void ArrayTest_i::a_octetArray ( void ArrayTest_i::a_doubleArray ( const ::DoubleArray a_doubleArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here DoubleArray_copy (doubleArray_,a_doubleArray); @@ -394,9 +317,6 @@ void ArrayTest_i::a_doubleArray ( ::FloatArray_slice * ArrayTest_i::a_floatArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return FloatArray_dup (floatArray_); @@ -405,9 +325,6 @@ void ArrayTest_i::a_doubleArray ( void ArrayTest_i::a_floatArray ( const ::FloatArray a_floatArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here FloatArray_copy (floatArray_,a_floatArray); @@ -416,9 +333,6 @@ void ArrayTest_i::a_floatArray ( ::BucketArray_slice * ArrayTest_i::a_bucketArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return BucketArray_dup (bucketArray_); @@ -427,9 +341,6 @@ void ArrayTest_i::a_floatArray ( void ArrayTest_i::a_bucketArray ( const ::BucketArray a_bucketArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here BucketArray_copy (bucketArray_,a_bucketArray); @@ -438,9 +349,6 @@ void ArrayTest_i::a_bucketArray ( ::AccountArray_slice * ArrayTest_i::a_accountArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return AccountArray_dup (accountArray_); @@ -449,9 +357,6 @@ void ArrayTest_i::a_bucketArray ( void ArrayTest_i::a_accountArray ( const ::AccountArray a_accountArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here AccountArray_copy (accountArray_,a_accountArray); @@ -460,9 +365,6 @@ void ArrayTest_i::a_accountArray ( ::BooleanArray_slice * ArrayTest_i::a_booleanArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return BooleanArray_dup (booleanArray_); @@ -471,9 +373,6 @@ void ArrayTest_i::a_accountArray ( void ArrayTest_i::a_booleanArray ( const ::BooleanArray a_booleanArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here BooleanArray_copy (booleanArray_,a_booleanArray); @@ -482,9 +381,6 @@ void ArrayTest_i::a_booleanArray ( ::LongArrayArray_slice * ArrayTest_i::a_longArrayArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return LongArrayArray_dup (longArrayArray_); @@ -493,9 +389,6 @@ void ArrayTest_i::a_booleanArray ( void ArrayTest_i::a_longArrayArray ( const ::LongArrayArray a_longArrayArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here LongArrayArray_copy (longArrayArray_,a_longArrayArray); @@ -504,9 +397,6 @@ void ArrayTest_i::a_longArrayArray ( ::MyEnumArray_slice * ArrayTest_i::a_myEnumArray ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here return MyEnumArray_dup (enumArray_); @@ -515,9 +405,6 @@ void ArrayTest_i::a_longArrayArray ( void ArrayTest_i::a_myEnumArray ( const ::MyEnumArray a_myEnumArray ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { // Add your implementation here MyEnumArray_copy (enumArray_,a_myEnumArray); diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h index 4868bd08e72..4bcf79943b1 100644 --- a/TAO/tests/Bug_2188_Regression/broken_i.h +++ b/TAO/tests/Bug_2188_Regression/broken_i.h @@ -42,11 +42,9 @@ class ServerAdmin_i : public virtual POA_ServerAdmin public: ServerAdmin_i (ArrayTest_ptr target); virtual ~ServerAdmin_i (void); - ArrayTest_ptr target(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + ArrayTest_ptr target(void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: ArrayTest_var target_; @@ -83,310 +81,199 @@ public: const ::LongArray p1, ::LongArray p2, ::LongArray_out p3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::StringArray_slice * stringArrayOp ( const ::StringArray p1, ::StringArray p2, ::StringArray_out p3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::ShortArray_slice * shortArrayOp ( const ::ShortArray p1, ::ShortArray p2, ::ShortArray_out p3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::UShortArray_slice * ushortArrayOp ( const ::UShortArray p1, ::UShortArray p2, ::UShortArray_out p3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::CharArray_slice * charArrayOp ( const ::CharArray p1, ::CharArray p2, ::CharArray_out p3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::OctetArray_slice * octetArrayOp ( const ::OctetArray p1, ::OctetArray p2, ::OctetArray_out p3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::DoubleArray_slice * doubleArrayOp ( const ::DoubleArray p1, ::DoubleArray p2, ::DoubleArray_out p3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::LongArray_slice * a_longArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_longArray ( const ::LongArray a_longArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::ULongArray_slice * a_ulongArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_ulongArray ( const ::ULongArray a_ulongArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::StringArray_slice * a_stringArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_stringArray ( const ::StringArray a_stringArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::ShortArray_slice * a_shortArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_shortArray ( const ::ShortArray a_shortArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::UShortArray_slice * a_ushortArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_ushortArray ( const ::UShortArray a_ushortArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual CORBA::Char a_char ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_char ( ::CORBA::Char a_char - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::CharArray_slice * a_charArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_charArray ( const ::CharArray a_charArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::OctetArray_slice * a_octetArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_octetArray ( const ::OctetArray a_octetArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::DoubleArray_slice * a_doubleArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_doubleArray ( const ::DoubleArray a_doubleArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::FloatArray_slice * a_floatArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_floatArray ( const ::FloatArray a_floatArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::BucketArray_slice * a_bucketArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_bucketArray ( const ::BucketArray a_bucketArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::AccountArray_slice * a_accountArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_accountArray ( const ::AccountArray a_accountArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::BooleanArray_slice * a_booleanArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_booleanArray ( const ::BooleanArray a_booleanArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::LongArrayArray_slice * a_longArrayArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_longArrayArray ( const ::LongArrayArray a_longArrayArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual ::MyEnumArray_slice * a_myEnumArray ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void a_myEnumArray ( const ::MyEnumArray a_myEnumArray - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; diff --git a/TAO/tests/Bug_2234_Regression/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp index 0d50549b028..84f5caad219 100644 --- a/TAO/tests/Bug_2234_Regression/server.cpp +++ b/TAO/tests/Bug_2234_Regression/server.cpp @@ -42,7 +42,6 @@ public: CORBA::Long_out b, CORBA::Long &c ) - ACE_THROW_SPEC( (CORBA::SystemException ) ) { ACE_DEBUG( (LM_INFO, ". in TestLong\n") ); if (static_cast<CORBA::Long>( 1 ) != a) @@ -69,7 +68,6 @@ public: CORBA::String_out b, char *&c ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, ". in TestString\n") ); if (0 == a) @@ -116,7 +114,6 @@ public: Test::MyNonVarStruct_out b, Test::MyNonVarStruct &c ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { Test::MyNonVarStruct newret; @@ -154,7 +151,6 @@ public: Test::MyVarStruct_out b, Test::MyVarStruct &c ) - ACE_THROW_SPEC(( CORBA::SystemException )) { ACE_DEBUG( (LM_INFO, ". in TestVarStruct\n") ); if (0 == a.val.in()) @@ -218,7 +214,6 @@ public: Test::MyNonVarUnion_out b, Test::MyNonVarUnion &c ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { Test::MyNonVarUnion newret; @@ -266,7 +261,6 @@ public: Test::MyVarUnion_out b, Test::MyVarUnion &c ) - ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_DEBUG( (LM_INFO, ". in TestVarUnion\n") ); if (static_cast<CORBA::Short>( 1 ) != a._d()) @@ -316,7 +310,6 @@ public: Test::MySeqOfLong_out b, Test::MySeqOfLong &c ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, ". in TestSeqOfLong\n") ); if (1u != a.length()) @@ -367,7 +360,6 @@ public: CORBA::Any_out b, CORBA::Any &c ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, ". in TestAny\n") ); CORBA::Long aL; @@ -421,7 +413,6 @@ public: void ShutdownServer( ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, ". in ShutdownServer\n") ); orb->shutdown(0); @@ -435,24 +426,19 @@ class AnInterceptor : public PortableInterceptor::ServerRequestInterceptor { public: char *name( ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { return const_cast<char *>(""); } void destroy( ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { } void receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr ) - ACE_THROW_SPEC( (CORBA::SystemException, - PortableInterceptor::ForwardRequest) ) { } - // Note this helper only deals with the types inserted into // the any that we defined for this test. static void display_any( const CORBA::Any &arg ) @@ -598,8 +584,6 @@ public: void receive_request( PortableInterceptor::ServerRequestInfo_ptr ri ) - ACE_THROW_SPEC( (CORBA::SystemException, - PortableInterceptor::ForwardRequest) ) { ACE_DEBUG( (LM_INFO, "AnInterceptor::receive_request\n") ); Dynamic::ParameterList @@ -615,7 +599,6 @@ public: void send_reply( PortableInterceptor::ServerRequestInfo_ptr ri ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { ACE_DEBUG( (LM_INFO, "AnInterceptor::send_reply\n") ); Dynamic::ParameterList @@ -631,16 +614,11 @@ public: void send_exception( PortableInterceptor::ServerRequestInfo_ptr ) - ACE_THROW_SPEC( (CORBA::SystemException, - PortableInterceptor::ForwardRequest) ) { } - void send_other( PortableInterceptor::ServerRequestInfo_ptr ) - ACE_THROW_SPEC( (CORBA::SystemException, - PortableInterceptor::ForwardRequest) ) { } }; @@ -656,14 +634,12 @@ public: void pre_init( PortableInterceptor::ORBInitInfo_ptr ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { } void post_init( PortableInterceptor::ORBInitInfo_ptr info ) - ACE_THROW_SPEC( (CORBA::SystemException) ) { info->add_server_request_interceptor( interceptor_ ); } diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc index e2d0b8a08cc..960c4f67ad2 100644 --- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc +++ b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc @@ -25,7 +25,6 @@ project(*Server): taoserver, iortable { project(*Client): taoserver, iortable { exename = client after += *idl - after += *Server Source_Files { client.cpp TestC.cpp diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp index 2ceb5662238..26e65b4f03d 100644 --- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp +++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp @@ -13,7 +13,6 @@ MyInterfaceImpl::MyInterfaceImpl (CORBA::ORB_ptr orb) } CORBA::Boolean MyInterfaceImpl::myMethod (const char* mystring) - ACE_THROW_SPEC ((CORBA::SystemException)) { return mystring == my_string; } diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h index 4f460c9d3f3..bdfc6ce9f6d 100644 --- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h +++ b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h @@ -13,8 +13,7 @@ class MyInterfaceImpl static const char* my_string; // = The skeleton methods - virtual CORBA::Boolean myMethod (const char* stringParam) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean myMethod (const char* stringParam); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index 935fd16ade1..81cea2eef11 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -32,8 +32,7 @@ class ST_AMH_Servant ST_AMH_Servant (CORBA::ORB_ptr orb); void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, - Test::Timestamp send_time) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::Timestamp send_time); protected: CORBA::ORB_ptr orb_; @@ -124,7 +123,6 @@ ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb) void ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh, Test::Timestamp send_time) - ACE_THROW_SPEC ((CORBA::SystemException)) { printf("Recieved Timestamp # %d \n", calls_received); ACE_OS::sleep(1); diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc index 9fdbd894b7d..ccb8a89d9e4 100644 --- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc +++ b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc @@ -22,7 +22,6 @@ project(*Server): taoserver, codeset { project(*Client): taoclient { after += *idl - after += *Server Source_Files { TestC.cpp client.cpp diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp index ee5dcf4c2a3..65ef14806b2 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.cpp +++ b/TAO/tests/Bug_2328_Regression/Hello.cpp @@ -12,7 +12,6 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (const char * A, const char * B, const char * C) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Received: <%s>, <%s>, <%s>\n", A, B, C)); return CORBA::string_dup ("Hello there!"); @@ -20,7 +19,6 @@ Hello::get_string (const char * A, const char * B, const char * C) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h index f93bc8ae434..883a1a610d7 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.h +++ b/TAO/tests/Bug_2328_Regression/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (const char * A, const char * B, const char * C) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (const char * A, const char * B, const char * C); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc index c01afd5aedd..28055823491 100644 --- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc +++ b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc @@ -21,7 +21,6 @@ project(*server): taoserver { project(*client): taoclient { after += *idl - after += *Server Source_Files { fooC.cpp client.cpp diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp index c4fd6e66f28..c174c8cb0cd 100644 --- a/TAO/tests/Bug_2349_Regression/server.cpp +++ b/TAO/tests/Bug_2349_Regression/server.cpp @@ -12,11 +12,9 @@ public: : orb_ (CORBA::ORB::_duplicate (orb)) { } - void shutdown () - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (); - void destroy () - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (); private: CORBA::ORB_var orb_; @@ -24,14 +22,12 @@ private: void foo_i::shutdown () - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } void foo_i::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { bool expected_exception_raised = false; diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index 9bdb1e53f3c..ff00c029f9d 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -135,18 +135,12 @@ Publisher_impl::~Publisher_impl() void subscribe ( ::Subscriber_ptr subscriber - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); void Publisher_impl::subscribe( ::Subscriber_ptr subscriber ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { worker->addSubscriber(subscriber); } @@ -154,9 +148,6 @@ Publisher_impl::subscribe( void Publisher_impl::shutdown ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { this->orb_->shutdown (0); worker->terminate(); diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.h b/TAO/tests/Bug_2417_Regression/publisher_impl.h index a33a436ded5..ec64ca450f6 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.h +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.h @@ -14,16 +14,10 @@ class Publisher_impl : public POA_Publisher virtual void subscribe ( ::Subscriber_ptr subscriber - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); virtual void shutdown ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp index e6e6c49453a..07b5da4e9a2 100644 --- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp @@ -17,9 +17,6 @@ void Subscriber_impl::onData ( ::CORBA::Double ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { ++count; if (count > 100) @@ -29,9 +26,6 @@ Subscriber_impl::onData ( ::CORBA::Boolean Subscriber_impl::isAlive ( ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { return true; } diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.h b/TAO/tests/Bug_2417_Regression/subscriber_impl.h index 99e9d1b7c71..f7d159d1294 100644 --- a/TAO/tests/Bug_2417_Regression/subscriber_impl.h +++ b/TAO/tests/Bug_2417_Regression/subscriber_impl.h @@ -13,15 +13,9 @@ class Subscriber_impl : public POA_Subscriber virtual void onData ( ::CORBA::Double value - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); virtual ::CORBA::Boolean isAlive ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); void shutdown(); private: diff --git a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc index 71c3f8a21bb..fcc7a879916 100644 --- a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc +++ b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc @@ -31,7 +31,6 @@ project(*Server) : taoserver, messaging { project(*Client) : taoclient, messaging { exename = client after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.cpp b/TAO/tests/Bug_2429_Regression/ChildServant.cpp index 5f7ad67d59d..9f81ba41932 100644 --- a/TAO/tests/Bug_2429_Regression/ChildServant.cpp +++ b/TAO/tests/Bug_2429_Regression/ChildServant.cpp @@ -9,14 +9,12 @@ ChildServant::ChildServant(CORBA::ORB_ptr orb) void ChildServant::childMethod () -ACE_THROW_SPEC ((CORBA::SystemException)) { // No-op } void ChildServant::parentMethod () -ACE_THROW_SPEC((CORBA::SystemException)) { // Just throw an exception throw CORBA::INTERNAL (); @@ -24,7 +22,6 @@ ACE_THROW_SPEC((CORBA::SystemException)) void ChildServant::shutdown () -ACE_THROW_SPEC((CORBA::SystemException)) { this->orb_->shutdown(0); } diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.h b/TAO/tests/Bug_2429_Regression/ChildServant.h index 55d601d3cc0..cb342276e15 100644 --- a/TAO/tests/Bug_2429_Regression/ChildServant.h +++ b/TAO/tests/Bug_2429_Regression/ChildServant.h @@ -10,12 +10,9 @@ class ChildServant { public: ChildServant (CORBA::ORB_ptr orb); - virtual void parentMethod () - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void childMethod () - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void parentMethod (); + virtual void childMethod (); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp index 14bdeba81b2..52ccddbb824 100644 --- a/TAO/tests/Bug_2429_Regression/client.cpp +++ b/TAO/tests/Bug_2429_Regression/client.cpp @@ -16,14 +16,12 @@ class Reply_Handler virtual void childMethod (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } virtual void childMethod_excep (Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -37,7 +35,6 @@ class Reply_Handler virtual void parentMethod (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "client: parentMethod reply %d @ %T\n", @@ -47,7 +44,6 @@ class Reply_Handler virtual void parentMethod_excep (Messaging::ExceptionHolder * excep_holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc index 1214006b391..a4f043c20bb 100644 --- a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc +++ b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc @@ -25,7 +25,6 @@ project(*Server): taoserver { project(*Client): taoclient { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Bug_2494_Regression/test_i.cpp b/TAO/tests/Bug_2494_Regression/test_i.cpp index bfccb378f26..4a23db96ac0 100644 --- a/TAO/tests/Bug_2494_Regression/test_i.cpp +++ b/TAO/tests/Bug_2494_Regression/test_i.cpp @@ -12,7 +12,6 @@ ACE_RCSID(Bug_2494_Regression, test_i, "$Id$") char * Simple_Server_i::test_method (const char *x) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n")); @@ -23,7 +22,6 @@ Simple_Server_i::test_method (const char *x) void Simple_Server_i::shutdown () - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2494_Regression/test_i.h b/TAO/tests/Bug_2494_Regression/test_i.h index cd8971dc7a6..8eb1d8efcf6 100644 --- a/TAO/tests/Bug_2494_Regression/test_i.h +++ b/TAO/tests/Bug_2494_Regression/test_i.h @@ -18,11 +18,9 @@ public: // ctor // = The Simple_Server methods. - char *test_method (const char *x) - ACE_THROW_SPEC ((CORBA::SystemException)); + char *test_method (const char *x); - void shutdown () - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc index 538d116a20e..427b134b358 100644 --- a/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc +++ b/TAO/tests/Bug_2503_Regression/Bug_2503_Regression.mpc @@ -25,7 +25,6 @@ project(*Server): messaging, taoserver, ami { project(*Client): messaging, taoexe, portableserver, ami { after += *idl - after += *Server Source_Files { test_i.cpp common.cpp diff --git a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc index 209f14c1f17..8b35bf371a2 100644 --- a/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc +++ b/TAO/tests/Bug_2593_Regression/Bug_2593_Regression.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, strategies { project(*Client): taoclient { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp index 3bb0a772b76..df5dc90d3d9 100644 --- a/TAO/tests/Bug_2593_Regression/Hello.cpp +++ b/TAO/tests/Bug_2593_Regression/Hello.cpp @@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/Bug_2593_Regression/Hello.h +++ b/TAO/tests/Bug_2593_Regression/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc index 02e2ddc1120..2e4131f6280 100644 --- a/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc +++ b/TAO/tests/Bug_2595_Regression/Bug_2595_Regression.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver { project(*Client): taoclient { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp index 1891607cda1..f95f30bdc85 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.cpp +++ b/TAO/tests/Bug_2595_Regression/Hello.cpp @@ -15,9 +15,6 @@ Hello::op ( ::Test::Fls_out fstruct, ::Test::Vls_out vstruct ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { Test::Fls a = {5, 1.0}; fstruct = a; @@ -26,7 +23,6 @@ Hello::op ( void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h index 3d09966e3fc..ffee7b8e0f8 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.h +++ b/TAO/tests/Bug_2595_Regression/Hello.h @@ -19,13 +19,9 @@ public: virtual void op ( ::Test::Fls_out fstruct, ::Test::Vls_out vstruct - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_2654_Regression/Hello.cpp b/TAO/tests/Bug_2654_Regression/Hello.cpp index 70c29c92ddc..15de800ac23 100644 --- a/TAO/tests/Bug_2654_Regression/Hello.cpp +++ b/TAO/tests/Bug_2654_Regression/Hello.cpp @@ -32,7 +32,6 @@ Hello::Hello (CORBA::ORB_ptr orb) void Hello::set_callback (Test::CallBack_ptr cb) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG,"(%P|%t) got callback \n")); this->callback_ = Test::CallBack::_duplicate(cb); @@ -41,7 +40,6 @@ Hello::set_callback (Test::CallBack_ptr cb) void Hello::method (CORBA::Short count) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (++this->count_ > 10) { diff --git a/TAO/tests/Bug_2654_Regression/Hello.h b/TAO/tests/Bug_2654_Regression/Hello.h index 960867daf74..7171680d945 100644 --- a/TAO/tests/Bug_2654_Regression/Hello.h +++ b/TAO/tests/Bug_2654_Regression/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void method (CORBA::Short count) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void method (CORBA::Short count); - virtual void set_callback (Test::CallBack_ptr cb) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void set_callback (Test::CallBack_ptr cb); private: diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp index 1def4e63883..3b196a85a87 100644 --- a/TAO/tests/Bug_2654_Regression/client.cpp +++ b/TAO/tests/Bug_2654_Regression/client.cpp @@ -28,7 +28,6 @@ class Callback_i : public POA_Test::CallBack { public: void method2(void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n")); } diff --git a/TAO/tests/Bug_2683_Regression/IORTable.mpc b/TAO/tests/Bug_2683_Regression/IORTable.mpc index 621b224312e..bd207aa6449 100644 --- a/TAO/tests/Bug_2683_Regression/IORTable.mpc +++ b/TAO/tests/Bug_2683_Regression/IORTable.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, iortable { project(*Client): taoclient { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp index 28843cc512f..4b4cdfae441 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.cpp +++ b/TAO/tests/Bug_2683_Regression/test_i.cpp @@ -11,14 +11,12 @@ test_i::test_i (ORB_Killer *k) void test_i::ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown \n")); this->killer_->activate (); diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h index 8bdf00fe6d6..9cbd85b3468 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.h +++ b/TAO/tests/Bug_2683_Regression/test_i.h @@ -29,11 +29,9 @@ public: test_i (ORB_Killer *k); // = The skeleton methods - virtual void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void ping (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp index d7339a7eb0b..9cfd6c265c9 100644 --- a/TAO/tests/COIOP/Hello.cpp +++ b/TAO/tests/COIOP/Hello.cpp @@ -17,7 +17,6 @@ ACE_RCSID(Hello, Hello, "$Id$") char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -60,7 +59,6 @@ Hello::get_string (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h index 63b4ec180be..556409e5d00 100644 --- a/TAO/tests/COIOP/Hello.h +++ b/TAO/tests/COIOP/Hello.h @@ -20,11 +20,9 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp index 1c0399091fd..a7ca8835ecc 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp @@ -19,7 +19,6 @@ Foo_A_i::~Foo_A_i() void Foo_A_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[0] ++; } @@ -27,7 +26,6 @@ Foo_A_i::op1(void) void Foo_A_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[1].push_back (value); this->op_count_[1] ++; @@ -36,7 +34,6 @@ Foo_A_i::op2(CORBA::Long value) CORBA::Long Foo_A_i::op3(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[2].push_back (value); this->op_count_[2] ++; @@ -46,7 +43,6 @@ Foo_A_i::op3(CORBA::Long value) void Foo_A_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[3].push_back (value); this->op_count_[3] ++; @@ -55,7 +51,6 @@ Foo_A_i::op4(CORBA::Long value) void Foo_A_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { this->op_count_[4] ++; throw FooException(); @@ -64,7 +59,6 @@ Foo_A_i::op5(void) void Foo_A_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { TheAppShutdown->client_done(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h index b55ee063666..16a53f60ddf 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h @@ -14,23 +14,17 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A Foo_A_i(); virtual ~Foo_A_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(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(CORBA::Long value); - 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); void gather_stats (Foo_A_Statistics& stats) ; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp index d48f56fc505..31b0d120dae 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp @@ -14,7 +14,6 @@ Callback_i::~Callback_i () void Callback_i::test_method(void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->num_callbacks_ ++; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h index 86afee9b4f7..cb9b851c68e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h @@ -16,8 +16,7 @@ class CSD_TP_Foo_B_Export Callback_i virtual ~Callback_i(); - virtual void test_method(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_method(void); void gather_stats(Foo_B_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp index 0870febeb3c..730d8f2e922 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp @@ -23,7 +23,6 @@ Foo_B_i::~Foo_B_i() void Foo_B_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[0] ++; } @@ -31,7 +30,6 @@ Foo_B_i::op1(void) void Foo_B_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[1] ++; this->in_long_[1].push_back (value); @@ -40,7 +38,6 @@ Foo_B_i::op2(CORBA::Long value) CORBA::Long Foo_B_i::op3(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[2] ++; this->in_long_[2].push_back (value); @@ -50,7 +47,6 @@ Foo_B_i::op3(CORBA::Long value) void Foo_B_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[3] ++; this->in_long_[3].push_back (value); @@ -59,7 +55,6 @@ Foo_B_i::op4(CORBA::Long value) void Foo_B_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { this->op_count_[4] ++; throw FooException(); @@ -69,7 +64,6 @@ Foo_B_i::op5(void) CORBA::Boolean Foo_B_i::op6(const TimeOfDay& t, char*& message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[5] ++; char buf [20]; @@ -83,8 +77,6 @@ Foo_B_i::op6(const TimeOfDay& t, void Foo_B_i::op7(Callback_ptr cb) - ACE_THROW_SPEC((CORBA::SystemException, - FooException)) { this->op_count_[6] ++; @@ -104,7 +96,6 @@ Foo_B_i::op7(Callback_ptr cb) void Foo_B_i::test_unbounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[7] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_string_arg ") @@ -116,7 +107,6 @@ Foo_B_i::test_unbounded_string_arg(const char* message) void Foo_B_i::test_bounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[8] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_string_arg ") @@ -128,7 +118,6 @@ Foo_B_i::test_bounded_string_arg(const char* message) void Foo_B_i::test_fixed_array_arg(const Fixed_Array message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[9] ++; @@ -155,7 +144,6 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message) void Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[10] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_var_size_arg ") @@ -167,7 +155,6 @@ Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message) void Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[11] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_var_size_arg ") @@ -179,7 +166,6 @@ Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message) void Foo_B_i::test_fixed_size_arg(const TimeOfDay& t) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(t); @@ -192,7 +178,6 @@ Foo_B_i::test_fixed_size_arg(const TimeOfDay& t) void Foo_B_i::test_var_array_arg(const Var_Array messages) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[13] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ") @@ -236,7 +221,6 @@ Foo_B_i::test_var_array_arg(const Var_Array messages) void Foo_B_i::test_special_basic_arg(CORBA::Boolean value, CORBA::Long client_id) - ACE_THROW_SPEC((CORBA::SystemException)) { this->op_count_[14] ++; //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_special_basic_arg ") @@ -255,7 +239,6 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value, void Foo_B_i::test_objref_arg(Callback_ptr cb) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_UNUSED_ARG(cb); this->op_count_[15] ++; @@ -266,7 +249,6 @@ Foo_B_i::test_objref_arg(Callback_ptr cb) void Foo_B_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { TheAppShutdown->client_done(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h index 56d8109ed78..1a0367a27e7 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h @@ -14,59 +14,41 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B Foo_B_i(); virtual ~Foo_B_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(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(CORBA::Long value); - 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 TimeOfDay& t, - char*& message) - ACE_THROW_SPEC((CORBA::SystemException)); + char*& message); - virtual void op7(Callback_ptr cb) - ACE_THROW_SPEC((CORBA::SystemException, - FooException)); + virtual void op7(Callback_ptr cb); - virtual void test_unbounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_unbounded_string_arg(const char* message); - virtual void test_bounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_bounded_string_arg(const char* message); - virtual void test_fixed_array_arg(const Fixed_Array message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_fixed_array_arg(const Fixed_Array message); - virtual void test_var_array_arg(const Var_Array messages) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_var_array_arg(const Var_Array messages); - virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message); - virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message); - virtual void test_fixed_size_arg(const TimeOfDay& t) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_fixed_size_arg(const TimeOfDay& t); virtual void test_special_basic_arg(CORBA::Boolean value, - CORBA::Long client_id) - ACE_THROW_SPEC((CORBA::SystemException)); + CORBA::Long client_id); - virtual void test_objref_arg(Callback_ptr cb) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void test_objref_arg(Callback_ptr cb); - virtual void done(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void done(void); void gather_stats (Foo_B_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp index b15bee24580..d9e11bfad32 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp @@ -20,7 +20,6 @@ Foo_C_i::~Foo_C_i() void Foo_C_i::op1(void) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->count_[0]; } @@ -28,7 +27,6 @@ Foo_C_i::op1(void) void Foo_C_i::op2(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[1].push_back (value); ++this->count_[1]; @@ -37,7 +35,6 @@ Foo_C_i::op2(CORBA::Long value) CORBA::Long Foo_C_i::op3(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[2].push_back (value); ++this->count_[2]; @@ -47,7 +44,6 @@ Foo_C_i::op3(CORBA::Long value) void Foo_C_i::op4(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)) { this->in_values_[3].push_back (value); ++this->count_[3]; @@ -56,7 +52,6 @@ Foo_C_i::op4(CORBA::Long value) void Foo_C_i::op5(void) - ACE_THROW_SPEC((CORBA::SystemException, FooException)) { ++this->count_[4]; throw FooException(); @@ -65,7 +60,6 @@ Foo_C_i::op5(void) void Foo_C_i::done(void) - ACE_THROW_SPEC((CORBA::SystemException)) { TheAppShutdown->client_done(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h index d804d58ba00..6262bce85dd 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h @@ -14,24 +14,17 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C Foo_C_i(); virtual ~Foo_C_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(CORBA::Long value) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual CORBA::Long op3(CORBA::Long value); - 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); void cust_op1(void); void cust_op2(long value); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp index 3bb0a772b76..df5dc90d3d9 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp @@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc index 9e3a806413a..899a542fef2 100644 --- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc +++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver { project(*Client): taoclient, anytypecode { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp index 309a24676b8..e574f52ba2f 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.cpp +++ b/TAO/tests/Cache_Growth_Test/Hello.cpp @@ -15,7 +15,6 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) { @@ -28,7 +27,6 @@ Hello::get_string (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.h +++ b/TAO/tests/Cache_Growth_Test/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp index 60c5e152398..f233dd2b229 100644 --- a/TAO/tests/CallbackTest/Callback.cpp +++ b/TAO/tests/CallbackTest/Callback.cpp @@ -12,7 +12,6 @@ Callback::Callback (CORBA::ORB_ptr orb) CORBA::Boolean Callback::are_you_there (CORBA::String_out answer) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Callback - we are here!\n")); @@ -24,7 +23,6 @@ Callback::are_you_there (CORBA::String_out answer) void Callback::test_oneway (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Callback - test_oneway!\n")); @@ -32,7 +30,6 @@ Callback::test_oneway (void) void Callback::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Callback - shutdown!\n")); diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h index cc0e453bcc1..98b92c1bb72 100644 --- a/TAO/tests/CallbackTest/Callback.h +++ b/TAO/tests/CallbackTest/Callback.h @@ -17,14 +17,11 @@ public: Callback (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Boolean are_you_there (CORBA::String_out answer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean are_you_there (CORBA::String_out answer); - virtual void test_oneway (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void test_oneway (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to shutdown the application. CORBA::ORB_var orb_; diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc index 186510c1f55..2bd74f5ef3a 100644 --- a/TAO/tests/CallbackTest/CallbackTest.mpc +++ b/TAO/tests/CallbackTest/CallbackTest.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, portableserver, messaging { after += *idl - after += *Server Source_Files { Callback.cpp client.cpp diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp index f1d7494b043..c8563ef6ad7 100644 --- a/TAO/tests/CallbackTest/Service.cpp +++ b/TAO/tests/CallbackTest/Service.cpp @@ -23,7 +23,6 @@ Service::dump_results (void) void Service::run_test (Test::Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)) { int exceptions = this->call_are_you_there (callback); @@ -56,7 +55,6 @@ Service::run_test (Test::Callback_ptr callback) int Service::call_are_you_there (Test::Callback_ptr callback) - ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n")); const int iterations = 10; @@ -82,7 +80,6 @@ Service::call_are_you_there (Test::Callback_ptr callback) int Service::call_test_oneway (Test::Callback_ptr callback) - ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n")); const int iterations = 10; diff --git a/TAO/tests/CallbackTest/Service.h b/TAO/tests/CallbackTest/Service.h index a3b5f905c89..b0fe219d517 100644 --- a/TAO/tests/CallbackTest/Service.h +++ b/TAO/tests/CallbackTest/Service.h @@ -23,23 +23,20 @@ public: void dump_results (void); // = The skeleton methods - virtual void run_test (Test::Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void run_test (Test::Callback_ptr callback); private: /// Call the are_you_there callback multiple times. /** * @return Number of exceptions raised */ - int call_are_you_there (Test::Callback_ptr callback) - ACE_THROW_SPEC (()); + int call_are_you_there (Test::Callback_ptr callback); /// Call the test_oneway method mutiple times. /** * @return Number of exceptions raised */ - int call_test_oneway (Test::Callback_ptr callback) - ACE_THROW_SPEC (()); + int call_test_oneway (Test::Callback_ptr callback); private: /// Count the number of tests executed diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc index 87611da09ef..6bc40e6725e 100644 --- a/TAO/tests/Client_Leaks/Client_Leaks.mpc +++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc @@ -26,7 +26,6 @@ project(*Server): taoserver { project(*Client): taoclient, anytypecode { after += *idl - after += *Server Source_Files { Client_Task.cpp client.cpp diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp index 9985fcfdfe0..8b6d7257784 100644 --- a/TAO/tests/Client_Leaks/Process.cpp +++ b/TAO/tests/Client_Leaks/Process.cpp @@ -13,14 +13,12 @@ Process::Process (CORBA::ORB_ptr orb) CORBA::Long Process::get_process_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return ACE_OS::getpid (); } void Process::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h index 66e56de62de..dab625cabb5 100644 --- a/TAO/tests/Client_Leaks/Process.h +++ b/TAO/tests/Client_Leaks/Process.h @@ -17,11 +17,9 @@ public: Process (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Long get_process_id (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long get_process_id (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp index 5ede5f6bae5..a673b0eb352 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.cpp +++ b/TAO/tests/Client_Leaks/Process_Factory.cpp @@ -21,7 +21,6 @@ Process_Factory::shutdown_received (void) Test::Process_ptr Process_Factory::create_new_process (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed)) { Startup_Callback *startup_callback_impl; ACE_NEW_THROW_EX (startup_callback_impl, @@ -97,13 +96,11 @@ Process_Factory::create_new_process (void) void Process_Factory::noop (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Process_Factory::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->shutdown_received_ = 1; this->orb_->shutdown (0); diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h index 2aee99b70cf..2131b6a37cf 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.h +++ b/TAO/tests/Client_Leaks/Process_Factory.h @@ -20,14 +20,11 @@ public: int shutdown_received (void); // = The skeleton methods - virtual Test::Process_ptr create_new_process (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test::Spawn_Failed)); + virtual Test::Process_ptr create_new_process (void); - virtual void noop (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void noop (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp index ea0b6043c97..341c89ead6e 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.cpp +++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp @@ -23,7 +23,6 @@ Startup_Callback::process_has_started (Test::Process_out the_process) void Startup_Callback::started (Test::Process_ptr process) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->process_ = Test::Process::_duplicate (process); diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h index e8207cc846e..9278b235cc2 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.h +++ b/TAO/tests/Client_Leaks/Startup_Callback.h @@ -24,8 +24,7 @@ public: int process_has_started (Test::Process_out the_process); // = The skeleton methods - virtual void started (Test::Process_ptr the_process) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void started (Test::Process_ptr the_process); private: /// Synchronize changes to the internal data diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index 00d26a6b55a..66927c8d9d6 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -39,7 +39,6 @@ public: char * op1 (const char * name, const CORBA::Any & inany, CORBA::Any_out outany) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server: bare string: %s\n", name)); @@ -59,13 +58,11 @@ public: }; ACE_CDR::WChar * op2 (const ACE_CDR::WChar *s1) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::wstring_dup (s1); }; void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); }; diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp index 1aed52ccf2f..0200835d0a8 100644 --- a/TAO/tests/Collocation/Diamond_i.cpp +++ b/TAO/tests/Collocation/Diamond_i.cpp @@ -14,9 +14,6 @@ Top_i::~Top_i () char * Top_i::shape (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("a point."); } @@ -33,18 +30,12 @@ Left_i::~Left_i () char * Left_i::shape (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("the left line"); } char * Left_i::color (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("black"); } @@ -61,18 +52,12 @@ Right_i::~Right_i () char * Right_i::shape (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("the right line"); } char * Right_i::color (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("red"); // @@ -80,9 +65,6 @@ Right_i::color (void) CORBA::Long Right_i::width (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return 0; } @@ -99,36 +81,24 @@ Buttom_i::~Buttom_i () char * Buttom_i::shape (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("a diamond"); } char * Buttom_i::color (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("translucent"); } CORBA::Long Buttom_i::width (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return 100; } char * Buttom_i::name (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("Jubilee"); } diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h index e57cf1a6468..d8801332823 100644 --- a/TAO/tests/Collocation/Diamond_i.h +++ b/TAO/tests/Collocation/Diamond_i.h @@ -17,8 +17,7 @@ public: ~Top_i (void); // Ctor and dtor. - virtual char * shape (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * shape (void); // Return the shape of this object (interface.) }; @@ -29,12 +28,10 @@ public: ~Left_i (void); // Ctor, dtor. - virtual char * shape (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * shape (void); // Return the shape of this object (interface.) - virtual char * color (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * color (void); // Return the color of this object (interface.) }; @@ -45,16 +42,13 @@ public: ~Right_i (void); // Ctor, dtor. - virtual char * shape (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * shape (void); // Return the shape of this object (interface.) - virtual char * color (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * color (void); // Return the color of this object (interface.) - virtual CORBA::Long width (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long width (void); // Return the width of the stuff. }; @@ -65,20 +59,16 @@ public: ~Buttom_i (void); // Ctor, dtor. - virtual char * shape (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * shape (void); // Return the shape of this object (interface.) - virtual char * color (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * color (void); // Return the color of this object (interface.) - virtual CORBA::Long width (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long width (void); // Return the width of the stuff. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Return the name of the object. }; diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp index 4d91591ca64..2362176f053 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.cpp +++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp @@ -16,21 +16,18 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$") void Hello::system_exception_test (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::INTERNAL (); } void Hello::user_exception_expected (void) - ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)) { throw ::Test::Hello::A (); } void Hello::user_exception_not_expected (void) - ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)) { this->throw_internal_b (); } @@ -43,7 +40,6 @@ Hello::throw_internal_b (void) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -86,7 +82,6 @@ Hello::get_string (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h index bb4f2265ec4..3fef01855b0 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.h +++ b/TAO/tests/Collocation_Exception_Test/Hello.h @@ -25,20 +25,15 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void system_exception_test (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void system_exception_test (void); - virtual void user_exception_expected (void) - ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)); + virtual void user_exception_expected (void); - virtual void user_exception_not_expected (void) - ACE_THROW_SPEC ((CORBA::SystemException, ::Test::Hello::A)); + virtual void user_exception_not_expected (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: void throw_internal_b (void); diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp index 8eb26a89ec3..6a3b92b19eb 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp @@ -16,7 +16,6 @@ ACE_RCSID(Collocation_Oneway_Tests, Hello, "$Id$") void Hello::onewayTest (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) onewayTest() Upcall in process ..\n")); @@ -26,7 +25,6 @@ Hello::onewayTest (void) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -69,7 +67,6 @@ Hello::get_string (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h index 6ac1109f422..8bc4edf7d76 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.h +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h @@ -25,14 +25,11 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void onewayTest (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void onewayTest (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 94fcf1589b7..8f661b034c7 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -18,8 +18,7 @@ public: void set_other (test_ptr test); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); PortableServer::POA_ptr _default_POA (void); @@ -54,7 +53,6 @@ test_i::set_other (test_ptr test) void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->other_.in () != test::_nil ()) { diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp index fb956dded83..aee38a6676c 100644 --- a/TAO/tests/Collocation_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Tests/Hello.cpp @@ -16,7 +16,6 @@ ACE_RCSID(Hello, Hello, "$Id$") char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -59,7 +58,6 @@ Hello::get_string (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h index 63b4ec180be..556409e5d00 100644 --- a/TAO/tests/Collocation_Tests/Hello.h +++ b/TAO/tests/Collocation_Tests/Hello.h @@ -20,11 +20,9 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc index 9e3a806413a..899a542fef2 100644 --- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc +++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver { project(*Client): taoclient, anytypecode { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp index 924779e1619..eabcfbe8db7 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.cpp +++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp @@ -13,14 +13,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.h +++ b/TAO/tests/Connect_Strategy_Test/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc index c0bd6da0fde..5a45cca020f 100644 --- a/TAO/tests/Connection_Purging/Connection_Purging.mpc +++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc @@ -24,7 +24,6 @@ project(*Server): strategies, taoserver { project(*Client): strategies, taoclient { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Connection_Purging/test_i.cpp b/TAO/tests/Connection_Purging/test_i.cpp index de59e99593c..7d4cee20e12 100644 --- a/TAO/tests/Connection_Purging/test_i.cpp +++ b/TAO/tests/Connection_Purging/test_i.cpp @@ -5,7 +5,6 @@ void test_i::send_stuff (const char* string) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string)); } diff --git a/TAO/tests/Connection_Purging/test_i.h b/TAO/tests/Connection_Purging/test_i.h index bebd408b2d0..4b12aa9e33c 100644 --- a/TAO/tests/Connection_Purging/test_i.h +++ b/TAO/tests/Connection_Purging/test_i.h @@ -13,8 +13,7 @@ class test_i { public: // = The skeleton methods - virtual void send_stuff (const char* string) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_stuff (const char* string); private: }; diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc index ce52c6776dc..278271d77ca 100644 --- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc +++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc @@ -25,7 +25,6 @@ project(*Server): taoserver { project(*Client): taoclient { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp index ea9818cc706..8b7f4f4119a 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp @@ -11,6 +11,5 @@ Oneway_Receiver::Oneway_Receiver (void) void Oneway_Receiver::receive_oneway (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h index 167206a943b..141636d9361 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h @@ -17,8 +17,7 @@ public: Oneway_Receiver (void); // = The skeleton methods - virtual void receive_oneway (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_oneway (void); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index 5d96a31ec01..80580ae7033 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -11,14 +11,12 @@ Crashed_Callback::Crashed_Callback (void) CORBA::Boolean Crashed_Callback::are_you_there (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void Crashed_Callback::crash_now_please (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Crashed_Callback - crashing application \n")); @@ -35,6 +33,5 @@ Crashed_Callback::crash_now_please (void) void Crashed_Callback::test_oneway (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h index 3efa13bd774..e8a17b21832 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.h +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h @@ -17,14 +17,11 @@ public: Crashed_Callback (void); // = The skeleton methods - virtual CORBA::Boolean are_you_there (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean are_you_there (void); - virtual void crash_now_please (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void crash_now_please (void); - virtual void test_oneway (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void test_oneway (void); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc index fb46b04e3df..f628c6296ee 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, messaging { project(*Client): taoclient, portableserver, messaging { after += *idl - after += *Server Source_Files { Crashed_Callback.cpp client.cpp diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp index d6a33d93d7a..04fb261c1b2 100644 --- a/TAO/tests/Crashed_Callback/Service.cpp +++ b/TAO/tests/Crashed_Callback/Service.cpp @@ -22,7 +22,6 @@ Service::dump_results (void) void Service::run_test (Test::Crashed_Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)) { int pre_crash_exceptions = this->call_are_you_there (callback); @@ -65,7 +64,6 @@ Service::run_test (Test::Crashed_Callback_ptr callback) int Service::call_are_you_there (Test::Crashed_Callback_ptr callback) - ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling are_you_there\n")); const int iterations = 50; @@ -87,7 +85,6 @@ Service::call_are_you_there (Test::Crashed_Callback_ptr callback) int Service::call_test_oneway (Test::Crashed_Callback_ptr callback) - ACE_THROW_SPEC (()) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Service, calling test_oneway\n")); const int iterations = 50; diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h index b0cdc9b35ec..99d430525f1 100644 --- a/TAO/tests/Crashed_Callback/Service.h +++ b/TAO/tests/Crashed_Callback/Service.h @@ -23,23 +23,20 @@ public: void dump_results (void); // = The skeleton methods - virtual void run_test (Test::Crashed_Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void run_test (Test::Crashed_Callback_ptr callback); private: /// Call the are_you_there callback multiple times. /** * @return Number of exceptions raised */ - int call_are_you_there (Test::Crashed_Callback_ptr callback) - ACE_THROW_SPEC (()); + int call_are_you_there (Test::Crashed_Callback_ptr callback); /// Call the test_oneway method mutiple times. /** * @return Number of exceptions raised */ - int call_test_oneway (Test::Crashed_Callback_ptr callback) - ACE_THROW_SPEC (()); + int call_test_oneway (Test::Crashed_Callback_ptr callback); private: /// Count the number of tests executed diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp index a6144215762..b021e38bb47 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -36,9 +36,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void) void Test_Simple_Test_i::test_method ( ::CORBA::ULong & error_count ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { error_count --; } @@ -55,9 +52,6 @@ void Hello::test_basic_arg ( ::CORBA::Long basic ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (basic != TEST_BASIC_VALUE) ERROR_COUNT ("Hello::test_basic_arg") @@ -65,7 +59,6 @@ Hello::test_basic_arg ( void Hello::test_unbounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg ") @@ -80,7 +73,6 @@ Hello::test_unbounded_string_arg(const char* message) void Hello::test_bounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_string_arg ") @@ -95,7 +87,6 @@ Hello::test_bounded_string_arg(const char* message) void Hello::test_fixed_array_arg(const ::Test::Fixed_Array message) - ACE_THROW_SPEC((CORBA::SystemException)) { for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++) { @@ -111,7 +102,6 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message) void Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_var_size_arg ") @@ -123,7 +113,6 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message) void Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_var_size_arg ") @@ -135,7 +124,6 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message void Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_fixed_size_arg ") @@ -151,7 +139,6 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t) void Hello::test_var_array_arg(const Test::Var_Array messages) - ACE_THROW_SPEC((CORBA::SystemException)) { for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++) { @@ -166,7 +153,6 @@ Hello::test_var_array_arg(const Test::Var_Array messages) void Hello::test_special_basic_arg(CORBA::Char value) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_special_basic_arg ") @@ -179,9 +165,6 @@ Hello::test_special_basic_arg(CORBA::Char value) void Hello::test_objref_arg ( ::Test::Simple_Test_ptr test ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_objref_arg \n"))); @@ -205,9 +188,6 @@ void Hello::test_objref_arg ( void Hello::test_object_arg ( ::CORBA::Object_ptr o ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n"))); @@ -227,9 +207,6 @@ void Hello::test_args_1 ( ::CORBA::Char arg2, ::Test::Simple_Test_ptr arg3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n"))); @@ -255,9 +232,6 @@ void Hello::test_args_2 ( const ::Test::Fixed_Array arg2, const ::Test::TimeOfDay & arg3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n"))); @@ -282,9 +256,6 @@ void Hello::test_args_3 ( const ::Test::Unbounded_Var_Size_Arg & arg3, const ::Test::Var_Array arg4 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3 \n"))); @@ -303,7 +274,6 @@ void Hello::test_args_3 ( char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -346,9 +316,6 @@ Hello::test_unbounded_string ( char *& s2, CORBA::String_out s3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { char *retstr = CORBA::string_dup (s1); s3 = CORBA::string_dup (s1); @@ -361,7 +328,6 @@ Hello::test_unbounded_string ( void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h index 8564949a0ff..70d46f4813a 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h @@ -23,10 +23,7 @@ public: virtual void test_method ( ::CORBA::ULong & error_count - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; /// Implement the Test::Hello interface @@ -42,110 +39,71 @@ public: virtual void test_basic_arg ( ::CORBA::Long basic - ) - 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 ::Test::Fixed_Array message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_var_array_arg ( const ::Test::Var_Array messages - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_bounded_var_size_arg ( const ::Test::Bounded_Var_Size_Arg & message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_unbounded_var_size_arg ( const ::Test::Unbounded_Var_Size_Arg & message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_fixed_size_arg ( const ::Test::TimeOfDay & t - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_special_basic_arg ( ::CORBA::Char value - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_objref_arg ( ::Test::Simple_Test_ptr test - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_object_arg ( ::CORBA::Object_ptr o - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_args_1 ( ::CORBA::Object_ptr arg1, ::CORBA::Char arg2, ::Test::Simple_Test_ptr arg3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_args_2 ( const char * arg1, const ::Test::Fixed_Array arg2, const ::Test::TimeOfDay & arg3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_args_3 ( @@ -153,26 +111,18 @@ public: const ::Test::Bounded_Var_Size_Arg & arg2, const ::Test::Unbounded_Var_Size_Arg & arg3, const ::Test::Var_Array arg4 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); virtual char * test_unbounded_string ( const char * s1, char *& s2, CORBA::String_out s3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp index d4e2a521bfe..0c21c44f5b5 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp @@ -36,9 +36,6 @@ Test_Simple_Test_i::~Test_Simple_Test_i (void) void Test_Simple_Test_i::test_method ( ::CORBA::ULong & error_count ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { error_count --; } @@ -56,9 +53,6 @@ Hello::test_basic_arg ( ::CORBA::Long basic, ::CORBA::Long_out x ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (basic != TEST_BASIC_VALUE) ERROR_COUNT ("Hello::test_basic_arg") @@ -68,7 +62,6 @@ Hello::test_basic_arg ( void Hello::test_unbounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_string_arg ") @@ -83,7 +76,6 @@ Hello::test_unbounded_string_arg(const char* message) void Hello::test_bounded_string_arg(const char* message) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_string_arg ") @@ -98,7 +90,6 @@ Hello::test_bounded_string_arg(const char* message) void Hello::test_fixed_array_arg(const ::Test::Fixed_Array message) - ACE_THROW_SPEC((CORBA::SystemException)) { for (unsigned i = 0; i < ::Test::FIX_ARRAY_SIZE; i++) { @@ -114,7 +105,6 @@ Hello::test_fixed_array_arg(const ::Test::Fixed_Array message) void Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_bounded_var_size_arg ") @@ -126,7 +116,6 @@ Hello::test_bounded_var_size_arg(const ::Test::Bounded_Var_Size_Arg& message) void Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_unbounded_var_size_arg ") @@ -138,7 +127,6 @@ Hello::test_unbounded_var_size_arg(const ::Test::Unbounded_Var_Size_Arg& message void Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_fixed_size_arg ") @@ -154,7 +142,6 @@ Hello::test_fixed_size_arg(const ::Test::TimeOfDay& t) void Hello::test_var_array_arg(const Test::Var_Array messages) - ACE_THROW_SPEC((CORBA::SystemException)) { for (CORBA::ULong i = 0; i != ::Test::VAR_ARRAY_SIZE; i ++) { @@ -169,7 +156,6 @@ Hello::test_var_array_arg(const Test::Var_Array messages) void Hello::test_special_basic_arg(CORBA::Char value) - ACE_THROW_SPEC((CORBA::SystemException)) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_special_basic_arg ") @@ -182,9 +168,6 @@ Hello::test_special_basic_arg(CORBA::Char value) void Hello::test_objref_arg ( ::Test::Simple_Test_ptr test ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_objref_arg \n"))); @@ -208,9 +191,6 @@ void Hello::test_objref_arg ( void Hello::test_object_arg ( ::CORBA::Object_ptr o ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_object_arg \n"))); @@ -230,9 +210,6 @@ void Hello::test_args_1 ( ::CORBA::Char arg2, ::Test::Simple_Test_ptr arg3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_1 \n"))); @@ -258,9 +235,6 @@ void Hello::test_args_2 ( const ::Test::Fixed_Array arg2, const ::Test::TimeOfDay & arg3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_2 \n"))); @@ -285,9 +259,6 @@ void Hello::test_args_3 ( const ::Test::Unbounded_Var_Size_Arg & arg3, const ::Test::Var_Array arg4 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { if (debug) ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Hello::test_args_3 \n"))); @@ -306,7 +277,6 @@ void Hello::test_args_3 ( char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -349,9 +319,6 @@ Hello::test_unbounded_string ( char *& s2, CORBA::String_out s3 ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { char *retstr = CORBA::string_dup (s1); s3 = CORBA::string_dup (s1); @@ -364,7 +331,6 @@ Hello::test_unbounded_string ( void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h index f97f94609c9..210748f7469 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h @@ -23,10 +23,7 @@ public: virtual void test_method ( ::CORBA::ULong & error_count - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; /// Implement the Test::Hello interface @@ -43,110 +40,71 @@ public: void test_basic_arg ( ::CORBA::Long basic, ::CORBA::Long_out x - ) - 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 ::Test::Fixed_Array message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_var_array_arg ( const ::Test::Var_Array messages - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_bounded_var_size_arg ( const ::Test::Bounded_Var_Size_Arg & message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_unbounded_var_size_arg ( const ::Test::Unbounded_Var_Size_Arg & message - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_fixed_size_arg ( const ::Test::TimeOfDay & t - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_special_basic_arg ( ::CORBA::Char value - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_objref_arg ( ::Test::Simple_Test_ptr test - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_object_arg ( ::CORBA::Object_ptr o - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_args_1 ( ::CORBA::Object_ptr arg1, ::CORBA::Char arg2, ::Test::Simple_Test_ptr arg3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_args_2 ( const char * arg1, const ::Test::Fixed_Array arg2, const ::Test::TimeOfDay & arg3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual void test_args_3 ( @@ -154,26 +112,18 @@ public: const ::Test::Bounded_Var_Size_Arg & arg2, const ::Test::Unbounded_Var_Size_Arg & arg3, const ::Test::Var_Array arg4 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); virtual char * test_unbounded_string ( const char * s1, char *& s2, CORBA::String_out s3 - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); CORBA::ULong error_count () const; diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp index 43deb11f19d..9a3414ab41e 100644 --- a/TAO/tests/DLL_ORB/Test_i.cpp +++ b/TAO/tests/DLL_ORB/Test_i.cpp @@ -13,7 +13,6 @@ Test_i::Test_i (void) void Test_i::invoke_me ( /* */) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, "(%P|%t) Test method invoked.\n")); @@ -21,7 +20,6 @@ Test_i::invoke_me ( /* */) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h index f22788d8dfc..f7c893bd903 100644 --- a/TAO/tests/DLL_ORB/Test_i.h +++ b/TAO/tests/DLL_ORB/Test_i.h @@ -34,12 +34,10 @@ public: /// Simple two-way operation used to excercise the ORB transport /// internals. - virtual void invoke_me (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke_me (void); /// Shutdown the ORB. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); /// Set the ORB to be shutdown by the shutdown() method in this /// class. diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc index 7703b170041..241810bc49d 100644 --- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc +++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver, messaging, avoids_minimum_corba, avoids_corba_e_com project(*Client): taoclient, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface { after += *idl - after += *Server Source_Files { client.cpp } @@ -37,7 +36,6 @@ project(*Client): taoclient, messaging, avoids_minimum_corba, avoids_corba_e_com project(*Gateway): taoexe, portableserver, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro, dynamicinterface { after += *idl - after += *Client Source_Files { test_dsi.cpp gateway.cpp diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index 662e7bc2b09..349cb62d18f 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -12,7 +12,6 @@ ACE_RCSID(DSI_Gateway, test_dsi, "$Id$") void DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::NVList_ptr list; this->orb_->create_list (0, list); @@ -64,7 +63,6 @@ DSI_Simple_Server::invoke (CORBA::ServerRequest_ptr request) CORBA::RepositoryId DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &, PortableServer::POA_ptr) - ACE_THROW_SPEC (()) { return CORBA::string_dup ("IDL:Simple_Server:1.0"); } diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h index cd81121075c..5c5ea947a47 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.h +++ b/TAO/tests/DSI_Gateway/test_dsi.h @@ -36,14 +36,12 @@ public: // ctor // = The DynamicImplementation methods. - virtual void invoke (CORBA::ServerRequest_ptr request) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke (CORBA::ServerRequest_ptr request); virtual CORBA::RepositoryId _primary_interface ( const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - ) - ACE_THROW_SPEC (()); + ); virtual PortableServer::POA_ptr _default_POA ( ); diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp index c9eeeefa7e4..550fc830999 100644 --- a/TAO/tests/DSI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_Gateway/test_i.cpp @@ -14,7 +14,6 @@ Simple_Server_i::test_method (CORBA::Long x, const Structure& the_in_structure, Structure_out the_out_structure, char *&name) - ACE_THROW_SPEC ((CORBA::SystemException)) { Structure *tmp = 0; ACE_NEW_RETURN (tmp, Structure (the_in_structure), -1); @@ -39,36 +38,30 @@ Simple_Server_i::test_method (CORBA::Long x, void Simple_Server_i::raise_user_exception (void) - ACE_THROW_SPEC ((CORBA::SystemException, - test_exception)) { throw test_exception (33, "reactor meltdown", "kaput"); } void Simple_Server_i::raise_system_exception (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_PERMISSION (); } void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } CORBA::Long Simple_Server_i::test_val (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return vlong_; } void Simple_Server_i::test_val (CORBA::Long tv) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) { diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h index 9ec76830813..89e1c70d9f6 100644 --- a/TAO/tests/DSI_Gateway/test_i.h +++ b/TAO/tests/DSI_Gateway/test_i.h @@ -34,24 +34,17 @@ public: CORBA::Long test_method (CORBA::Long x, const Structure& the_in_structure, Structure_out the_out_structure, - char *&name) - ACE_THROW_SPEC ((CORBA::SystemException)); + char *&name); - CORBA::Long test_val (void) - ACE_THROW_SPEC (( CORBA::SystemException)); + CORBA::Long test_val (void); - void test_val (CORBA::Long test_val) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_val (CORBA::Long test_val); - void raise_user_exception (void) - ACE_THROW_SPEC ((CORBA::SystemException, - test_exception)); + void raise_user_exception (void); - void raise_system_exception (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void raise_system_exception (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: // The ORB diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp index c9501977326..4a0f81a2e56 100644 --- a/TAO/tests/Explicit_Event_Loop/server.cpp +++ b/TAO/tests/Explicit_Event_Loop/server.cpp @@ -60,7 +60,6 @@ parse_args (int argc, char *argv[]) TimeOfDay Time_impl:: get_gmt () - ACE_THROW_SPEC ((CORBA::SystemException)) { time_t time_now = time (0); struct tm *time_p = gmtime (&time_now); diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h index 4bf7d7c1b1f..63a80d2c89f 100644 --- a/TAO/tests/Explicit_Event_Loop/server.h +++ b/TAO/tests/Explicit_Event_Loop/server.h @@ -26,8 +26,7 @@ class Time_impl : public virtual POA_Time { public: - virtual TimeOfDay get_gmt (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual TimeOfDay get_gmt (void); }; #endif /* server_HH_ */ diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp index c4a63433eb6..fc0b34451e7 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.cpp +++ b/TAO/tests/Exposed_Policies/Counter_i.cpp @@ -22,28 +22,24 @@ Counter_Servant::~Counter_Servant (void) void Counter_Servant::increment (/**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->count_; } CORBA::Long Counter_Servant::get_count (/**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->count_; } void Counter_Servant::reset (/**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->count_ = 0; } void Counter_Servant::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->policy_tester_->shutdown (); } diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h index 29e6e3e7334..8703a2d95a9 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.h +++ b/TAO/tests/Exposed_Policies/Counter_i.h @@ -35,17 +35,13 @@ public: // = Counter Interface Methods Overloading. - virtual void increment (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void increment (void); - virtual CORBA::Long get_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long get_count (void); - virtual void reset (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void reset (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); protected: CORBA::Long count_; diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp index ce5c85fec29..467b010daa7 100644 --- a/TAO/tests/FL_Cube/test_i.cpp +++ b/TAO/tests/FL_Cube/test_i.cpp @@ -15,21 +15,18 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, void Simple_Server_i::set_x_angle (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->window_->set_x_angle (x); } void Simple_Server_i::set_y_angle (CORBA::Long y) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->window_->set_y_angle (y); } void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h index 27f2249229f..f4f97040b86 100644 --- a/TAO/tests/FL_Cube/test_i.h +++ b/TAO/tests/FL_Cube/test_i.h @@ -62,12 +62,9 @@ public: // ctor // = The Simple_Server methods. - void set_x_angle (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); - void set_y_angle (CORBA::Long y) - ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void set_x_angle (CORBA::Long x); + void set_y_angle (CORBA::Long y); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp index a952dec9087..44c4ff825aa 100644 --- a/TAO/tests/Faults/ping_i.cpp +++ b/TAO/tests/Faults/ping_i.cpp @@ -10,27 +10,23 @@ ACE_RCSID(Faults, test_i, "$Id$") void PingObject_i::ping (PingObject_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)) { callback->pong (); } void PingObject_i::pong (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void PingObject_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } PortableServer::POA_ptr PingObject_i::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h index 00bdba4fee1..79ec976b05c 100644 --- a/TAO/tests/Faults/ping_i.h +++ b/TAO/tests/Faults/ping_i.h @@ -34,15 +34,11 @@ public: // ctor // = The PingObject interface methods - void ping (PingObject_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); - void pong (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void ping (PingObject_ptr callback); + void pong (void); + void shutdown (void); + + PortableServer::POA_ptr _default_POA (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index bf03c9cbc8f..b8f5d176105 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -12,7 +12,6 @@ ACE_RCSID(Failure, test_i, "$Id$") void Callback_i::shutdown (CORBA::Boolean is_clean) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (is_clean == 0) { @@ -39,7 +38,6 @@ CORBA::Long Simple_Server_i::test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (do_callback) { @@ -54,7 +52,6 @@ Simple_Server_i::test_method (CORBA::Boolean do_callback, void Simple_Server_i::shutdown_now (CORBA::Boolean is_clean) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (is_clean == 0) { @@ -73,7 +70,6 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } @@ -84,7 +80,6 @@ CORBA::Long Middle_i::test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)) { int i = 0; for (; i != 10; ++i) @@ -110,14 +105,12 @@ Middle_i::test_method (CORBA::Boolean do_callback, void Middle_i::shutdown_now (CORBA::Boolean is_clean) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->server_->shutdown_now (is_clean); } void Middle_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h index fd8310c07f4..651fc6a33cd 100644 --- a/TAO/tests/Faults/test_i.h +++ b/TAO/tests/Faults/test_i.h @@ -32,8 +32,7 @@ public: Callback_i (CORBA::ORB_ptr orb); // ctor - void shutdown (CORBA::Boolean is_clean) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (CORBA::Boolean is_clean); // The callback method private: @@ -56,14 +55,11 @@ public: // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, - Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + Callback_ptr callback); - void shutdown_now (CORBA::Boolean is_clean) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown_now (CORBA::Boolean is_clean); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -86,14 +82,11 @@ public: // = The Simple_Server methods. CORBA::Long test_method (CORBA::Boolean do_callback, CORBA::Boolean is_clean, - Callback_ptr callback) - ACE_THROW_SPEC ((CORBA::SystemException)); + Callback_ptr callback); - void shutdown_now (CORBA::Boolean is_clean) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown_now (CORBA::Boolean is_clean); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_ptr orb_; diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index 557108e95e6..39a720c31ee 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -44,8 +44,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, @@ -151,8 +149,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 (); @@ -169,8 +165,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 (); @@ -190,8 +184,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 (); @@ -206,7 +198,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/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h index 1a6ba088622..3b4858c1c18 100644 --- a/TAO/tests/File_IO/File_i.h +++ b/TAO/tests/File_IO/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/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp index f133527feaf..120c6f7b96b 100644 --- a/TAO/tests/Forwarding/test_i.cpp +++ b/TAO/tests/Forwarding/test_i.cpp @@ -10,7 +10,6 @@ ACE_RCSID(Forwarding, test_i, "$Id$") CORBA::Boolean Simple_Server_i::test_is_a (const char * /* type */) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) test_is_a %s\n", type)); return 0; @@ -18,7 +17,6 @@ Simple_Server_i::test_is_a (const char * /* type */) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h index 36ea3f16ad1..60670e13d54 100644 --- a/TAO/tests/Forwarding/test_i.h +++ b/TAO/tests/Forwarding/test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Boolean test_is_a (const char * type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean test_is_a (const char * type); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp index a3f70b42eb9..81ee459c199 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp @@ -13,8 +13,6 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb) void Payload_Receiver::more_data (const Test::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Payload_Receiver::Invalid_Payload)) { ++this->count_; @@ -31,7 +29,6 @@ Payload_Receiver::more_data (const Test::Payload &payload) void Payload_Receiver::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h index 3ea7ab3acaa..41b4af2ac29 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h @@ -20,12 +20,9 @@ public: Payload_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void more_data (const Test::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Payload_Receiver::Invalid_Payload)); + virtual void more_data (const Test::Payload &payload); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); int get_count (void) const; diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp index da443e12eab..1da64d18952 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp @@ -13,8 +13,6 @@ Payload_Receiver::Payload_Receiver (CORBA::ORB_ptr orb) void Payload_Receiver::more_data (const Test::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Payload_Receiver::Invalid_Payload)) { ++this->count_; @@ -31,7 +29,6 @@ Payload_Receiver::more_data (const Test::Payload &payload) void Payload_Receiver::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h index e48ab5b2b05..24717072a73 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h @@ -20,12 +20,9 @@ public: Payload_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void more_data (const Test::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Payload_Receiver::Invalid_Payload)); + virtual void more_data (const Test::Payload &payload); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); int get_count (void) const; diff --git a/TAO/tests/Hang_Shutdown/test_i.h b/TAO/tests/Hang_Shutdown/test_i.h index 706fc513fee..2008a85d139 100644 --- a/TAO/tests/Hang_Shutdown/test_i.h +++ b/TAO/tests/Hang_Shutdown/test_i.h @@ -18,7 +18,6 @@ namespace Test // = The skeleton methods virtual void send_stuff (const char* str, CORBA::Boolean flag) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - [%C]\n", str)); diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp index 3bb0a772b76..df5dc90d3d9 100644 --- a/TAO/tests/Hello/Hello.cpp +++ b/TAO/tests/Hello/Hello.cpp @@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/Hello/Hello.h +++ b/TAO/tests/Hello/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc index 066f4725953..533fb3def3b 100644 --- a/TAO/tests/Hello/Hello.mpc +++ b/TAO/tests/Hello/Hello.mpc @@ -24,7 +24,6 @@ project(*Server): taoserver { project(*Client): taoclient { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index 19e8544dde1..83e1d2e1a4e 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp @@ -14,7 +14,6 @@ Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) Test::HelloWorld_ptr Hello::get_helloworld (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { HelloWorld *hello_world; ACE_NEW_THROW_EX (hello_world, @@ -30,7 +29,6 @@ Hello::get_helloworld (void) void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h index c7fe9919faf..39153a73819 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.h +++ b/TAO/tests/ICMG_Any_Bug/Hello.h @@ -19,11 +19,9 @@ public: /// Constructor Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - virtual Test::HelloWorld_ptr get_helloworld (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Test::HelloWorld_ptr get_helloworld (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp index 2c5653bbfdb..a3811dfb3d9 100644 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp @@ -14,7 +14,6 @@ HelloWorld::HelloWorld (void) char * HelloWorld::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("TAO Any Implementation Works!"); } diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h index 85c9da63242..ec68e481c8b 100644 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h @@ -18,8 +18,7 @@ public: HelloWorld (void); /// Constructor - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); }; diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp index e9694858821..fc4222d3e30 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp +++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp @@ -14,6 +14,5 @@ bogus::~bogus() void bogus::noop (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h index dceebf65eb0..65a72f2be16 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h +++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h @@ -15,8 +15,7 @@ public: bogus (); virtual ~bogus (); - virtual void noop (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void noop (void); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp index 3bb0a772b76..df5dc90d3d9 100644 --- a/TAO/tests/IPV6/Hello.cpp +++ b/TAO/tests/IPV6/Hello.cpp @@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/IPV6/Hello.h +++ b/TAO/tests/IPV6/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp index a702a184f19..0a6decbfecd 100644 --- a/TAO/tests/InterOp-Naming/INS_i.cpp +++ b/TAO/tests/InterOp-Naming/INS_i.cpp @@ -25,7 +25,6 @@ INS_i::orb (CORBA::ORB_ptr o) char * INS_i::test_ins (void) -ACE_THROW_SPEC (( CORBA::SystemException )) { ACE_DEBUG ((LM_DEBUG, "Inside Operation\n")); diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h index 28bfc384429..6f24fbc2094 100644 --- a/TAO/tests/InterOp-Naming/INS_i.h +++ b/TAO/tests/InterOp-Naming/INS_i.h @@ -33,8 +33,7 @@ public: ~INS_i (void); // Destructor. - char * test_ins (void) - ACE_THROW_SPEC (( CORBA::SystemException )); + char * test_ins (void); // test the INS. void orb (CORBA::ORB_ptr o); diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp index b2794eac59e..1a8c3d88221 100644 --- a/TAO/tests/Leader_Followers/test_i.cpp +++ b/TAO/tests/Leader_Followers/test_i.cpp @@ -12,14 +12,12 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } CORBA::ULong test_i::method (CORBA::ULong work) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server: Working for %d milli seconds @ %T\n", diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h index bee80a1826a..74db1115a2b 100644 --- a/TAO/tests/Leader_Followers/test_i.h +++ b/TAO/tests/Leader_Followers/test_i.h @@ -25,11 +25,9 @@ public: // ctor. // = The test interface methods. - CORBA::ULong method (CORBA::ULong work) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong method (CORBA::ULong work); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/LongDouble/LongDoubleTest.cpp b/TAO/tests/LongDouble/LongDoubleTest.cpp index 5961552c532..1980e729449 100644 --- a/TAO/tests/LongDouble/LongDoubleTest.cpp +++ b/TAO/tests/LongDouble/LongDoubleTest.cpp @@ -13,7 +13,6 @@ LongDoubleTest::LongDoubleTest (CORBA::ORB_ptr orb) CORBA::LongDouble LongDoubleTest::get_long_double () - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::LongDouble ld; ACE_CDR_LONG_DOUBLE_ASSIGNMENT (ld, Global::get_long_double ()); @@ -22,7 +21,6 @@ LongDoubleTest::get_long_double () void LongDoubleTest::shutdown () - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/LongDouble/LongDoubleTest.h b/TAO/tests/LongDouble/LongDoubleTest.h index 0c7799d5afe..76b0674dd75 100644 --- a/TAO/tests/LongDouble/LongDoubleTest.h +++ b/TAO/tests/LongDouble/LongDoubleTest.h @@ -17,11 +17,9 @@ public: LongDoubleTest (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::LongDouble get_long_double () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::LongDouble get_long_double (); - virtual void shutdown () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index 8d21bac2f63..5a35e14622b 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -11,7 +11,6 @@ ACE_RCSID (LongUpcalls, static void validate_connection (Test::Controller_ptr controller) - ACE_THROW_SPEC (()) { try { @@ -36,7 +35,6 @@ void AMI_Manager::start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, Test::Controller_ptr controller) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Thread_Manager thread_manager; @@ -54,7 +52,6 @@ AMI_Manager::start_workers (CORBA::Short worker_count, void AMI_Manager::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } @@ -134,7 +131,6 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex, void Controller_Handler::worker_started (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); (*this->pending_replies_)--; @@ -143,7 +139,6 @@ Controller_Handler::worker_started (void) void Controller_Handler::worker_started_excep (::Messaging::ExceptionHolder* h) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -158,7 +153,6 @@ Controller_Handler::worker_started_excep void Controller_Handler::worker_finished (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); (*this->pending_replies_)--; @@ -167,7 +161,6 @@ Controller_Handler::worker_finished (void) void Controller_Handler::worker_finished_excep (::Messaging::ExceptionHolder *h) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index 271f1d5b4c3..604ae849cf7 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -16,10 +16,8 @@ public: // = The skeleton methods virtual void start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, - Test::Controller_ptr controller) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::Controller_ptr controller); + virtual void shutdown (void); private: CORBA::ORB_var orb_; @@ -60,14 +58,10 @@ public: int *pending_replies); // Constructor - virtual void worker_started (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_started_excep (::Messaging::ExceptionHolder*) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished_excep (::Messaging::ExceptionHolder*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void worker_started (void); + virtual void worker_started_excep (::Messaging::ExceptionHolder*); + virtual void worker_finished (void); + virtual void worker_finished_excep (::Messaging::ExceptionHolder*); private: TAO_SYNCH_MUTEX *mutex_; diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp index 69aebe53e9e..cb65f340fcb 100644 --- a/TAO/tests/LongUpcalls/Controller.cpp +++ b/TAO/tests/LongUpcalls/Controller.cpp @@ -25,7 +25,6 @@ Controller::dump_results () void Controller::worker_started (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->start_count_++; @@ -35,7 +34,6 @@ Controller::worker_started (void) void Controller::worker_finished (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->finish_count_++; diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h index ac3238e99db..21e23995b76 100644 --- a/TAO/tests/LongUpcalls/Controller.h +++ b/TAO/tests/LongUpcalls/Controller.h @@ -16,10 +16,8 @@ public: // Print out the results and any errors // = The skeleton methods - virtual void worker_started (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void worker_finished (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void worker_started (void); + virtual void worker_finished (void); private: TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp index 429713aa205..d6fcbbea8cb 100644 --- a/TAO/tests/LongUpcalls/Manager.cpp +++ b/TAO/tests/LongUpcalls/Manager.cpp @@ -11,7 +11,6 @@ ACE_RCSID (LongUpcalls, static void validate_connection (Test::Controller_ptr controller) - ACE_THROW_SPEC (()) { try { @@ -36,7 +35,6 @@ void Manager::start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, Test::Controller_ptr controller) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Thread_Manager thread_manager; @@ -53,7 +51,6 @@ Manager::start_workers (CORBA::Short worker_count, void Manager::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index 313c0be7b06..23d94be0ed7 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -18,10 +18,8 @@ public: // = The skeleton methods virtual void start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, - Test::Controller_ptr controller) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::Controller_ptr controller); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp index 49964f970a9..a38e2edbc36 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.cpp +++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp @@ -15,7 +15,6 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager, void Manager_Handler::start_workers (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -31,7 +30,6 @@ Manager_Handler::start_workers (void) void Manager_Handler::start_workers_excep (::Messaging::ExceptionHolder * holder) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h index 9899fa0b440..687d936fa38 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.h +++ b/TAO/tests/LongUpcalls/Manager_Handler.h @@ -17,10 +17,8 @@ public: // Constructor // = The skeleton methods - virtual void start_workers (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void start_workers_excep (::Messaging::ExceptionHolder *holder) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start_workers (void); + virtual void start_workers_excep (::Messaging::ExceptionHolder *holder); private: Test::Manager_var manager_; diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp index 76f835f9cf5..6c4ccf90aef 100644 --- a/TAO/tests/MProfile/test_i.cpp +++ b/TAO/tests/MProfile/test_i.cpp @@ -18,7 +18,6 @@ Simple_Server_i::Simple_Server_i (void) CORBA::Long Simple_Server_i::remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Print out from process id (%P) hosting the servant \n")); @@ -29,7 +28,6 @@ Simple_Server_i::remote_call (void) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h index 28eb022126c..07f971408ac 100644 --- a/TAO/tests/MProfile/test_i.h +++ b/TAO/tests/MProfile/test_i.h @@ -34,11 +34,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long remote_call (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp index 39960fc15f9..2ac070dd5c3 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp @@ -25,7 +25,6 @@ Simple_Server_i::Simple_Server_i (void) CORBA::ULongLong Simple_Server_i::remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Print out from process id (%P) hosting the servant \n")); @@ -36,7 +35,6 @@ Simple_Server_i::remote_call (void) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h index 733094afd73..cb4554e8655 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.h +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.h @@ -34,11 +34,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::ULongLong remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULongLong remote_call (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index 088b4727644..275d0c7f0a4 100644 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -44,8 +44,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr /* poa_ptr */, const char * /*operation*/, PortableServer::ServantLocator::Cookie & /* cookie */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { CORBA::String_var s = PortableServer::ObjectId_to_string (oid); @@ -79,7 +77,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &, const char *, PortableServer::ServantLocator::Cookie , PortableServer::Servant) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h index 8c717896577..112a61c7432 100644 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h +++ b/TAO/tests/MProfile_Forwarding/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 MyFoo 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 MyFooServant completes a // request. diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp index 1ef2fd374ec..e994bbf6c62 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.cpp +++ b/TAO/tests/MProfile_Forwarding/test_i.cpp @@ -16,7 +16,6 @@ Simple_Server_i::Simple_Server_i (void) void Simple_Server_i::remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Print out from process id (%P) hosting the servant \n")); @@ -25,7 +24,6 @@ Simple_Server_i::remote_call (void) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h index 5568f94a471..69525a827ec 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.h +++ b/TAO/tests/MProfile_Forwarding/test_i.h @@ -34,11 +34,9 @@ public: // ctor // = The Simple_Server methods. - void remote_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void remote_call (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp index 3be330a230d..b8e19c0c9a0 100644 --- a/TAO/tests/MT_BiDir/Receiver_i.cpp +++ b/TAO/tests/MT_BiDir/Receiver_i.cpp @@ -16,7 +16,6 @@ Receiver_i::Receiver_i (void) void Receiver_i::receive_payload (const Receiver::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); this->message_count_++; diff --git a/TAO/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h index ee0795c0a6c..398955cca27 100644 --- a/TAO/tests/MT_BiDir/Receiver_i.h +++ b/TAO/tests/MT_BiDir/Receiver_i.h @@ -23,8 +23,7 @@ public: CORBA::Long get_event_count (void); // = The skeleton methods - virtual void receive_payload (const Receiver::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_payload (const Receiver::Payload &payload); private: TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp index 2592d82d4d9..ba0c78d6c1a 100644 --- a/TAO/tests/MT_BiDir/Sender_i.cpp +++ b/TAO/tests/MT_BiDir/Sender_i.cpp @@ -30,8 +30,6 @@ Sender_i::Sender_i (int no_clients, CORBA::Long Sender_i::receiver_object (Receiver_ptr recv) - ACE_THROW_SPEC ((CORBA::SystemException, - Sender::Table_Full)) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, diff --git a/TAO/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h index 06176105b41..419e333f0b4 100644 --- a/TAO/tests/MT_BiDir/Sender_i.h +++ b/TAO/tests/MT_BiDir/Sender_i.h @@ -24,9 +24,7 @@ public: ACE_Manual_Event &event); // = The skeleton methods - virtual CORBA::Long receiver_object (Receiver *recv) - ACE_THROW_SPEC ((CORBA::SystemException, - Sender::Table_Full)); + virtual CORBA::Long receiver_object (Receiver *recv); /// Public method defined locally void send_message (void); diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp index 8b6b5696d99..ed136fa4fa4 100644 --- a/TAO/tests/MT_Client/test_i.cpp +++ b/TAO/tests/MT_Client/test_i.cpp @@ -10,13 +10,11 @@ ACE_RCSID(MT_Client, test_i, "$Id$") void Simple_Server_i::test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h index 79dd079bf2d..e38a1d70ad0 100644 --- a/TAO/tests/MT_Client/test_i.h +++ b/TAO/tests/MT_Client/test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - void test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp index 8bb3e551ecb..80aa987cc4a 100644 --- a/TAO/tests/MT_Server/test_i.cpp +++ b/TAO/tests/MT_Server/test_i.cpp @@ -12,7 +12,6 @@ ACE_RCSID(MT_Server, test_i, "$Id$") CORBA::Long Simple_Server_i::test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n")); @@ -23,7 +22,6 @@ Simple_Server_i::test_method (CORBA::Long x) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/MT_Server/test_i.h b/TAO/tests/MT_Server/test_i.h index 8934973a678..d1113ac50d7 100644 --- a/TAO/tests/MT_Server/test_i.h +++ b/TAO/tests/MT_Server/test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp index e3a26cfb38c..4af378547bc 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.cpp +++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp @@ -13,7 +13,6 @@ Sleep_Service::Sleep_Service (CORBA::ORB_ptr orb) void Sleep_Service::go_to_sleep (CORBA::ULong microseconds) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong secs = microseconds / 1000000; CORBA::ULong usecs = microseconds % 1000000; @@ -24,7 +23,6 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds) void Sleep_Service::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n")); this->orb_->shutdown (0); diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h index c1bdd5a5d2d..9a360fa9420 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.h +++ b/TAO/tests/MT_Timeout/Sleep_Service.h @@ -17,11 +17,9 @@ public: Sleep_Service (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void go_to_sleep (CORBA::ULong microseconds) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void go_to_sleep (CORBA::ULong microseconds); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index f24fa6be53b..06ba1e71ca6 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -21,35 +21,30 @@ Bottom_Impl::~Bottom_Impl (void) char * Bottom_Impl::top_quote ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::top); } char * Bottom_Impl::left_quote ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::left); } char * Bottom_Impl::right_quote ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::right); } char * Bottom_Impl::bottom_quote ( ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup(Quote::bottom); } void Bottom_Impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } @@ -71,7 +66,6 @@ Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void) char * Delegated_Bottom_Impl::top_quote (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <top_quote>\n"))); @@ -83,7 +77,6 @@ Delegated_Bottom_Impl::top_quote (void) char * Delegated_Bottom_Impl::left_quote (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <left_quote>\n"))); @@ -95,7 +88,6 @@ Delegated_Bottom_Impl::left_quote (void) char * Delegated_Bottom_Impl::right_quote (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <right_quote>\n"))); @@ -107,7 +99,6 @@ Delegated_Bottom_Impl::right_quote (void) char * Delegated_Bottom_Impl::bottom_quote (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <bottom_quote>\n"))); @@ -119,7 +110,6 @@ Delegated_Bottom_Impl::bottom_quote (void) void Delegated_Bottom_Impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating Shut-Down.\n"))); diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h index e72455225d6..97b507ea1b2 100644 --- a/TAO/tests/Multiple/Multiple_Impl.h +++ b/TAO/tests/Multiple/Multiple_Impl.h @@ -40,30 +40,15 @@ public: virtual ~Bottom_Impl (void); // IDL Interface Methods - virtual char * top_quote (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual char * left_quote (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual char * right_quote (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual char * bottom_quote (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual char * top_quote (void); + + virtual char * left_quote (void); + + virtual char * right_quote (void); + + virtual char * bottom_quote (void); + + virtual void shutdown (void); private: CORBA::ORB_var orb_; @@ -89,27 +74,12 @@ public: virtual ~Delegated_Bottom_Impl (void); // IDL Interface Methods. - virtual char * top_quote (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - virtual char * left_quote (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - virtual char * right_quote (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - virtual char * bottom_quote (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); - - virtual void shutdown (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + virtual char * top_quote (void); + virtual char * left_quote (void); + virtual char * right_quote (void); + virtual char * bottom_quote (void); + + virtual void shutdown (void); private: Multiple::Bottom_var delegate_; diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h index 69449348a84..f8a3e188bfe 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h @@ -10,22 +10,18 @@ public: Multiple_Inheritance_i (void); virtual char* method1 (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method1"); } virtual char* method2 (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method2"); } virtual char* method3 (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method3"); } virtual char* method4 (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("method4"); } diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp index fb3f743d84d..7090526b738 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp @@ -13,7 +13,6 @@ ACE_RCSID(MT_Server, test_i, "test_i.cpp,v 1.6 2002/01/29 20:21:08 okellogg Exp" CORBA::Long Simple_Server_i::test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n")); @@ -24,7 +23,6 @@ Simple_Server_i::test_method (CORBA::Long x) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // We dont shutdown the ORB. We allow the server to go away as it // wants. diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h index 8934973a678..d1113ac50d7 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.h +++ b/TAO/tests/Muxed_GIOP_Versions/test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp index 051bbb2e124..b746df4426e 100644 --- a/TAO/tests/Muxing/Receiver.cpp +++ b/TAO/tests/Muxing/Receiver.cpp @@ -25,7 +25,6 @@ Receiver::dump_results () void Receiver::receive_data (const Test::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_); this->message_count_++; @@ -34,7 +33,6 @@ Receiver::receive_data (const Test::Payload &payload) CORBA::Long Receiver::get_event_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->message_count_; @@ -42,7 +40,6 @@ Receiver::get_event_count (void) void Receiver::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h index 8117eab65f2..87abf4b5082 100644 --- a/TAO/tests/Muxing/Receiver.h +++ b/TAO/tests/Muxing/Receiver.h @@ -28,13 +28,10 @@ public: void dump_results (void); // = The skeleton methods - virtual void receive_data (const Test::Payload &payload) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Long get_event_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_data (const Test::Payload &payload); + virtual CORBA::Long get_event_count (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: ACE_SYNCH_MUTEX mutex_; diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp index 7712b291889..7e229bfb378 100644 --- a/TAO/tests/Native_Exceptions/test_i.cpp +++ b/TAO/tests/Native_Exceptions/test_i.cpp @@ -10,14 +10,12 @@ ACE_RCSID(Native_Exceptions, test_i, "$Id$") CORBA::Long Simple_Server_i::test_method (CORBA::Long x) - ACE_THROW_SPEC ((CORBA::SystemException)) { return x; } CORBA::Long Simple_Server_i::test_raise (CORBA::Long x) - ACE_THROW_SPEC ((Simple_Server::Failure)) { ACE_UNUSED_ARG (x); throw Simple_Server::Failure (); @@ -29,7 +27,6 @@ Simple_Server_i::test_raise (CORBA::Long x) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } diff --git a/TAO/tests/Native_Exceptions/test_i.h b/TAO/tests/Native_Exceptions/test_i.h index a90cc1d877a..1c3e6e973ef 100644 --- a/TAO/tests/Native_Exceptions/test_i.h +++ b/TAO/tests/Native_Exceptions/test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Long test_method (CORBA::Long x) - ACE_THROW_SPEC((CORBA::SystemException)); + CORBA::Long test_method (CORBA::Long x); - CORBA::Long test_raise (CORBA::Long x) - ACE_THROW_SPEC ((Simple_Server::Failure)); + CORBA::Long test_raise (CORBA::Long x); void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp index 475f8634d6e..c017c639d69 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp @@ -39,7 +39,6 @@ MT_Object_i::~MT_Object_i (void) CORBA::Long MT_Object_i::yadda (CORBA::Long hop_count, MT_Object_ptr partner) - ACE_THROW_SPEC ((CORBA::SystemException)) { #if 0 ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h index 99ac8b12d2b..bfddb076334 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h @@ -36,8 +36,7 @@ public: // Destructor. virtual CORBA::Long yadda (CORBA::Long hop_count, - MT_Object_ptr partner) - ACE_THROW_SPEC ((CORBA::SystemException)); + MT_Object_ptr partner); }; diff --git a/TAO/tests/NestedUpcall/Simple/client_i.cpp b/TAO/tests/NestedUpcall/Simple/client_i.cpp index e439f6a4461..7525ef2160c 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/client_i.cpp @@ -11,7 +11,6 @@ client_i::client_i (int quiet, void client_i::ping (CORBA::UShort time_to_live) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (!this->quiet_) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/NestedUpcall/Simple/client_i.h b/TAO/tests/NestedUpcall/Simple/client_i.h index e58d414344e..b0d308f04b8 100644 --- a/TAO/tests/NestedUpcall/Simple/client_i.h +++ b/TAO/tests/NestedUpcall/Simple/client_i.h @@ -9,8 +9,7 @@ public: server_ptr s); // Constructor. - void ping (CORBA::UShort time_to_live) - ACE_THROW_SPEC ((CORBA::SystemException)); + void ping (CORBA::UShort time_to_live); private: int quiet_; diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp index 1a93ac4f244..6e8e09d9f89 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp @@ -12,7 +12,6 @@ server_i::server_i (int quiet, void server_i::start (client_ptr c, CORBA::UShort time_to_live) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->client_ = client::_duplicate (c); this->ping (time_to_live); @@ -22,7 +21,6 @@ server_i::start (client_ptr c, void server_i::ping (CORBA::UShort time_to_live) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (!this->quiet_) ACE_DEBUG ((LM_DEBUG, @@ -39,7 +37,6 @@ server_i::ping (CORBA::UShort time_to_live) void server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h index ce84f3493c8..adc1cf9dd25 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.h +++ b/TAO/tests/NestedUpcall/Simple/server_i.h @@ -8,15 +8,12 @@ public: server_i (int quiet, CORBA::ORB_ptr orb); - void ping (CORBA::UShort time_to_live) - ACE_THROW_SPEC ((CORBA::SystemException)); + void ping (CORBA::UShort time_to_live); void start (client_ptr c, - CORBA::UShort time_to_live) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::UShort time_to_live); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: int quiet_; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp index 27fac829ee9..c2ecfcc8498 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp @@ -37,7 +37,6 @@ Initiator_i::~Initiator_i (void) void Initiator_i::foo_object_B (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h index fcbdd219d2d..2d9e9fa1cac 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -35,8 +35,7 @@ public: virtual ~Initiator_i (void); // Destructor. - virtual void foo_object_B (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void foo_object_B (void); private: Object_A_var object_A_var_; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index f36dd401fbf..66764ee0b3c 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -38,7 +38,6 @@ Object_A_i::~Object_A_i (void) void Object_A_i::foo (Initiator_ptr theInitiator_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -56,7 +55,6 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr) void Object_A_i::finish (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->finish_two_way_call_ = 1; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h index af7844e99a3..567412b6d83 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -34,11 +34,9 @@ public: virtual ~Object_A_i (void); // Destructor. - virtual void foo (Initiator_ptr theInitiator_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void foo (Initiator_ptr theInitiator_ptr); - virtual void finish (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void finish (void); unsigned long finish_two_way_call_; }; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 1d66255420b..3428fd18159 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -37,7 +37,6 @@ Object_B_i::~Object_B_i (void) void Object_B_i::foo (Object_A_ptr theObject_A_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h index 35c9f311e19..2eed4c74f4b 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h @@ -34,8 +34,7 @@ public: virtual ~Object_B_i (void); // Destructor. - virtual void foo(Object_A_ptr theObject_A_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void foo(Object_A_ptr theObject_A_ptr); }; #endif /* OBJECT_B_IMPL_H */ diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 32603e98df8..798b9912660 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -14,7 +14,6 @@ void server_i::loop (client_ptr remote_partner, CORBA::ULong event_loop_depth, CORBA::ULong event_loop_iterations) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "server_i::loop: event_loop_depth = %2.2d; event_loop_iterations = %2.2d\n", @@ -37,7 +36,6 @@ server_i::loop (client_ptr remote_partner, void server_i::run_no_ops (client_ptr remote_partner, CORBA::ULong iterations) - ACE_THROW_SPEC ((CORBA::SystemException)) { while (iterations != 0) { @@ -77,7 +75,6 @@ void server_i::no_op (client_ptr remote_partner, const act &act_for_iterations, const act &act_for_flag) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong *pointer_to_iterations = 0; @@ -104,7 +101,6 @@ server_i::no_op (client_ptr remote_partner, void server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } @@ -117,7 +113,6 @@ client_i::client_i (server_ptr remote_partner) void client_i::loop (CORBA::ULong event_loop_depth, CORBA::ULong event_loop_iterations) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "client_i::loop: event_loop_depth = %2.2d; event_loop_iterations = %2.2d\n", @@ -143,7 +138,6 @@ client_i::loop (CORBA::ULong event_loop_depth, void client_i::oneway_no_op (const act &act_for_iterations, const act &act_for_flag) - ACE_THROW_SPEC ((CORBA::SystemException)) { try @@ -163,7 +157,6 @@ client_i::oneway_no_op (const act &act_for_iterations, void client_i::twoway_no_op (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "client_i::twoway_no_op\n")); diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h index e7f8420ad0b..5fbbbb14bf1 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.h +++ b/TAO/tests/Nested_Event_Loop/test_i.h @@ -9,20 +9,16 @@ public: void loop (client_ptr remote_partner, CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong event_loop_iterations); void run_no_ops (client_ptr remote_partner, - CORBA::ULong iterations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong iterations); void no_op (client_ptr remote_partner, const act &act_for_iterations, - const act &act_for_flag) - ACE_THROW_SPEC ((CORBA::SystemException)); + const act &act_for_flag); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -34,15 +30,12 @@ public: client_i (server_ptr remote_partner); void loop (CORBA::ULong event_loop_depth, - CORBA::ULong event_loop_iterations) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong event_loop_iterations); void oneway_no_op (const act &act_for_iterations, - const act &act_for_flag) - ACE_THROW_SPEC ((CORBA::SystemException)); + const act &act_for_flag); - void twoway_no_op (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void twoway_no_op (void); private: server_var remote_partner_; diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp index acb1210811c..d1c51b21892 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp @@ -31,7 +31,6 @@ void Client_Peer::callme(Test::Peer_ptr callback, CORBA::ULong max_depth, Test::Payload const &) - ACE_THROW_SPEC((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Received call, depth = %d\n", max_depth)); if (max_depth > 0) @@ -47,7 +46,6 @@ Client_Peer::callme(Test::Peer_ptr callback, void Client_Peer::crash(void) - ACE_THROW_SPEC((CORBA::SystemException)) { Crasher * crasher = new Crasher; @@ -58,7 +56,6 @@ Client_Peer::crash(void) void Client_Peer::noop(void) - ACE_THROW_SPEC((CORBA::SystemException)) { } diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h index 9f80723f8a1..6d51a8910e6 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h @@ -19,12 +19,9 @@ public: void callme(Test::Peer_ptr callback, CORBA::ULong max_depth, - Test::Payload const &) - ACE_THROW_SPEC((CORBA::SystemException)); - void crash(void) - ACE_THROW_SPEC((CORBA::SystemException)); - void noop(void) - ACE_THROW_SPEC((CORBA::SystemException)); + Test::Payload const &); + void crash(void); + void noop(void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp index 36c6ad2d83b..bbb3983883c 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp @@ -24,7 +24,6 @@ void Server_Peer::callme(Test::Peer_ptr callback, CORBA::ULong max_depth, Test::Payload const &) - ACE_THROW_SPEC((CORBA::SystemException)) { int r = ACE_OS::rand_r(this->seed_) % 50; @@ -62,13 +61,11 @@ Server_Peer::callme(Test::Peer_ptr callback, void Server_Peer::crash(void) - ACE_THROW_SPEC((CORBA::SystemException)) { throw CORBA::NO_IMPLEMENT (); } void Server_Peer::noop(void) - ACE_THROW_SPEC((CORBA::SystemException)) { } diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h index a165d5372b5..0840e86c995 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h @@ -21,12 +21,9 @@ public: void callme(Test::Peer_ptr callback, CORBA::ULong max_depth, - Test::Payload const & extra_data) - ACE_THROW_SPEC((CORBA::SystemException)); - void crash(void) - ACE_THROW_SPEC((CORBA::SystemException)); - void noop(void) - ACE_THROW_SPEC((CORBA::SystemException)); + Test::Payload const & extra_data); + void crash(void); + void noop(void); private: ACE_RANDR_TYPE seed_; diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp index 1bc53fd3329..12636da24aa 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp @@ -11,13 +11,11 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) void Simple_Server_i::test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h index b411d5499b9..8a27179f677 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h +++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h @@ -18,11 +18,9 @@ public: // ctor // = The Simple_Server methods. - void test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp index e273412e2d5..20d38507d16 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.cpp +++ b/TAO/tests/OBV/Any/AnyS_impl.cpp @@ -13,7 +13,6 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) CORBA::Any* Test_impl::get_something ( CORBA::Boolean need_vb) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_ptr ret_val_ptr = 0; ACE_NEW_RETURN (ret_val_ptr, CORBA::Any, 0); @@ -48,7 +47,6 @@ Test_impl::get_something ( OBV_AnyTest::VB * Test_impl::get_vb() - ACE_THROW_SPEC ((CORBA::SystemException)) { const CORBA::ULong magic = 3145; @@ -61,7 +59,6 @@ Test_impl::get_vb() void Test_impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h index 610d83162a1..44540f31ac8 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.h +++ b/TAO/tests/OBV/Any/AnyS_impl.h @@ -32,14 +32,11 @@ public: // ctor virtual CORBA::Any * get_something ( - CORBA::Boolean need_vb) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean need_vb); - virtual OBV_AnyTest::VB * get_vb (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual OBV_AnyTest::VB * get_vb (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp index 780ba158671..206465a0e52 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp @@ -28,7 +28,6 @@ reflect_node (BaseNode* bn) TreeController * Test_impl::reflect (TreeController * tc) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (tc != 0) { @@ -40,7 +39,6 @@ Test_impl::reflect (TreeController * tc) void Test_impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h index 662273c97f9..56bfb18a128 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h @@ -34,11 +34,9 @@ public: // ctor virtual TreeController * reflect ( - TreeController * tc) - ACE_THROW_SPEC ((CORBA::SystemException)); + TreeController * tc); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp index f2fc37618ad..7bd2c91de8d 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp @@ -6,9 +6,6 @@ ACE_RCSID (Factory, OBV_FactoryTest::Value2* Value2_init_impl::create_default (CORBA::ULong id) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { OBV_FactoryTest::Value2* ret_val = 0; ACE_NEW_RETURN (ret_val, @@ -28,9 +25,6 @@ Value2_init_impl::create ( CORBA::ULong id, const OBV_FactoryTest::BaseValue::BV_Data & data ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { OBV_FactoryTest::Value2* ret_val = 0; ACE_NEW_RETURN (ret_val, diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h index a42c6089ee9..5c5c593c623 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.h +++ b/TAO/tests/OBV/Factory/FactoryC_impl.h @@ -42,18 +42,12 @@ public: virtual OBV_FactoryTest::Value2* create_default ( CORBA::ULong id - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); virtual OBV_FactoryTest::Value2* create ( CORBA::ULong id, const OBV_FactoryTest::BaseValue::BV_Data & data - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); public: diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp index 597f190ba66..57551f9d9ef 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp @@ -13,7 +13,6 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) OBV_FactoryTest::BaseValue * Test_impl::get_base_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::BaseValue* ret_val = 0; ACE_NEW_RETURN (ret_val, @@ -25,7 +24,6 @@ Test_impl::get_base_value (void) OBV_FactoryTest::Value1 * Test_impl::get_value1 (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::Value1* ret_val = 0; ACE_NEW_RETURN (ret_val, @@ -37,7 +35,6 @@ Test_impl::get_value1 (void) OBV_FactoryTest::Value2 * Test_impl::get_value2 (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { OBV_FactoryTest::Value2* ret_val = 0; ACE_NEW_RETURN (ret_val, @@ -49,7 +46,6 @@ Test_impl::get_value2 (void) void Test_impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h index 271bcdd2788..24dfdf771d3 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.h +++ b/TAO/tests/OBV/Factory/FactoryS_impl.h @@ -31,17 +31,13 @@ public: Test_impl (CORBA::ORB_ptr orb); // ctor - virtual OBV_FactoryTest::BaseValue * get_base_value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual OBV_FactoryTest::BaseValue * get_base_value (void); - virtual OBV_FactoryTest::Value1 * get_value1 (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual OBV_FactoryTest::Value1 * get_value1 (void); - virtual OBV_FactoryTest::Value2 * get_value2 (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual OBV_FactoryTest::Value2 * get_value2 (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp index 8282676a725..c55d885f0a4 100644 --- a/TAO/tests/OBV/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Forward/Test_impl.cpp @@ -31,7 +31,6 @@ reflect_node (BaseNode* bn) TreeController * Test_impl::reflect (TreeController * tc) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (tc != 0) { @@ -43,7 +42,6 @@ Test_impl::reflect (TreeController * tc) void Test_impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h index bd5a1eb6726..9092f1576e4 100644 --- a/TAO/tests/OBV/Forward/Test_impl.h +++ b/TAO/tests/OBV/Forward/Test_impl.h @@ -32,11 +32,9 @@ public: // ctor virtual TreeController * reflect ( - TreeController * tc) - ACE_THROW_SPEC ((CORBA::SystemException)); + TreeController * tc); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp index 4313a82209a..b3bd19a1cf1 100644 --- a/TAO/tests/OBV/Simple/Server_i.cpp +++ b/TAO/tests/OBV/Simple/Server_i.cpp @@ -43,7 +43,6 @@ Checkpoint_i::orb (CORBA::ORB_ptr o) void Checkpoint_i::put_event (Event *event) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Let us see what event has arrived event->do_print (); @@ -55,7 +54,6 @@ Checkpoint_i::put_event (Event *event) void Checkpoint_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "\n%s\n", diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h index 8eec39d2bef..0d249a51b72 100644 --- a/TAO/tests/OBV/Simple/Server_i.h +++ b/TAO/tests/OBV/Simple/Server_i.h @@ -37,14 +37,10 @@ public: virtual void put_event ( Event * e - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual void shutdown ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); void orb (CORBA::ORB_ptr o); // Set the ORB pointer. diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index a0f58373504..b83008c9a15 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -26,7 +26,6 @@ vt_graph_impl::vt_graph_impl (int num_nodes) // Get the number of nodes in the vt_graph. CORBA::Long vt_graph_impl::size (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return nodes_ ().length (); } @@ -34,7 +33,6 @@ CORBA::Long vt_graph_impl::size (void) // Add a node to the graph with no edges. void vt_graph_impl::add_node (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)) { Supports_Test::Node * new_node = 0; ACE_NEW (new_node, node_impl (name)); @@ -45,7 +43,6 @@ vt_graph_impl::add_node (const char * name) // Print out information about each node. void vt_graph_impl::print (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Printing graph data... \n")); @@ -62,7 +59,6 @@ vt_graph_impl::print (void) Supports_Test::vt_graph * vt_graph_init_impl::create (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { vt_graph_impl * ret_val = 0; ACE_NEW_RETURN (ret_val, vt_graph_impl, 0); @@ -92,8 +88,6 @@ test_impl::~test_impl (void) void test_impl::pass_obj_graph_in ( Supports_Test::graph * graph_param) - ACE_THROW_SPEC (( - CORBA::SystemException)) { ACE_ASSERT (graph_param->size () == 3); graph_param->add_node ("NEW1"); @@ -103,8 +97,6 @@ test_impl::pass_obj_graph_in ( void test_impl::pass_vt_graph_in ( Supports_Test::vt_graph * vt_graph_param) - ACE_THROW_SPEC (( - CORBA::SystemException)) { ACE_ASSERT (vt_graph_param->size () == 3); vt_graph_param->add_node ("NEW1"); @@ -114,8 +106,6 @@ test_impl::pass_vt_graph_in ( void test_impl::pass_obj_graph_out ( Supports_Test::graph_out graph_param) - ACE_THROW_SPEC (( - CORBA::SystemException)) { vt_graph_impl * the_vt_graph = 0; ACE_NEW (the_vt_graph, vt_graph_impl (4)); @@ -129,8 +119,6 @@ test_impl::pass_obj_graph_out ( void test_impl::pass_vt_graph_out ( Supports_Test::vt_graph_out vt_graph_param) - ACE_THROW_SPEC (( - CORBA::SystemException)) { vt_graph_impl * the_vt_graph = 0; @@ -146,8 +134,6 @@ test_impl::pass_vt_graph_out ( void test_impl::pass_obj_graph_inout ( Supports_Test::graph * &graph_param) - ACE_THROW_SPEC (( - CORBA::SystemException)) { ACE_ASSERT (graph_param->size () == 6); @@ -158,8 +144,6 @@ test_impl::pass_obj_graph_inout ( void test_impl::pass_vt_graph_inout ( Supports_Test::vt_graph * &vt_graph_param) - ACE_THROW_SPEC (( - CORBA::SystemException)) { ACE_ASSERT (vt_graph_param->size () == 6); @@ -175,7 +159,6 @@ test_impl::start (void) ACE_THROW_SPEC ((CORBA::SystemException)) void test_impl::finish (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->_remove_ref (); } @@ -199,7 +182,6 @@ node_impl::node_impl (const char * name) // Add an edge from this node to neighbor. void node_impl::add_edge (Supports_Test::Node * neighbor) - ACE_THROW_SPEC ((CORBA::SystemException)) { degree_ (degree_ () + 1); neighbors_ ().length (neighbors_ ().length () + 1); @@ -211,7 +193,6 @@ node_impl::add_edge (Supports_Test::Node * neighbor) // Remove the edge from this node to neighbor. void node_impl::remove_edge (Supports_Test::Node * neighbor) - ACE_THROW_SPEC ((CORBA::SystemException)) { for (unsigned int i = 0; i < neighbors_ ().length (); i++) if (neighbors_ ()[i] == neighbor) @@ -224,14 +205,12 @@ node_impl::remove_edge (Supports_Test::Node * neighbor) void node_impl::change_weight (CORBA::Long new_weight) - ACE_THROW_SPEC ((CORBA::SystemException)) { weight_ (new_weight); } void node_impl::print (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { cout << " Name: " << name_ () << endl; cout << " Weight: " << weight_ () << endl; @@ -245,7 +224,6 @@ node_impl::print (void) Supports_Test::Node * node_init_impl::create (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { node_impl * ret_val = 0; ACE_NEW_RETURN (ret_val, node_impl, 0); diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index d3b0be1649b..a5bf624df2f 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -22,17 +22,13 @@ public: node_impl (const char * name); - virtual void add_edge (Supports_Test::Node * neighbor) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void add_edge (Supports_Test::Node * neighbor); - virtual void remove_edge (Supports_Test::Node * neighbor) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void remove_edge (Supports_Test::Node * neighbor); - void change_weight (CORBA::Long new_weight) - ACE_THROW_SPEC ((CORBA::SystemException)); + void change_weight (CORBA::Long new_weight); - void print (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void print (void); }; @@ -41,8 +37,7 @@ class node_init_impl : public Supports_Test::Node_init public: - virtual Supports_Test::Node * create (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Supports_Test::Node * create (void); virtual CORBA::ValueBase * create_for_unmarshal (void); @@ -61,14 +56,11 @@ class vt_graph_impl : vt_graph_impl (int num_nodes); - virtual CORBA::Long size (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long size (void); - virtual void add_node (const char * name) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void add_node (const char * name); - virtual void print (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void print (void); }; @@ -78,8 +70,7 @@ class vt_graph_init_impl : public: - virtual Supports_Test::vt_graph * create (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Supports_Test::vt_graph * create (void); virtual CORBA::ValueBase * create_for_unmarshal (void); @@ -95,29 +86,21 @@ class test_impl : virtual ~test_impl (void); - virtual void pass_obj_graph_in (Supports_Test::graph * graph_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pass_obj_graph_in (Supports_Test::graph * graph_param); - virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pass_vt_graph_in (Supports_Test::vt_graph * vt_graph_param); - virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pass_obj_graph_out (Supports_Test::graph_out graph_param); - virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pass_vt_graph_out (Supports_Test::vt_graph_out vt_graph_param); - virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pass_obj_graph_inout (Supports_Test::graph * &graph_param); - virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param); - virtual void start (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void start (void); - virtual void finish (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void finish (void); private: diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp index c43b35e717f..734c078f6c8 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.cpp +++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp @@ -13,7 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb) CORBA::Any * test_i::get_value (CORBA::Long offset) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_ptr retval_ptr = 0; ACE_NEW_THROW_EX (retval_ptr, @@ -72,7 +71,6 @@ test_i::get_value (CORBA::Long offset) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h index d8cbb71f070..b51b8e7e1ab 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.h +++ b/TAO/tests/OBV/TC_Alignment/test_i.h @@ -39,11 +39,9 @@ class test_i :public virtual POA_test public: test_i (CORBA::ORB_ptr orb); - virtual CORBA::Any *get_value (CORBA::Long offset) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Any *get_value (CORBA::Long offset); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_ptr orb_; diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp index 0c39a541611..cd1b9c88096 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp @@ -17,9 +17,6 @@ Test_impl::op1 ( ::OBV_TruncatableTest::BaseValue_out ov, char *& desc ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { if (TAO_debug_level > 0) ACE_DEBUG((LM_DEBUG, @@ -45,9 +42,6 @@ Test_impl::op2 ( ::OBV_TruncatableTest::TValue1_out ov, char *& desc ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { if (TAO_debug_level > 0) ACE_DEBUG((LM_DEBUG, @@ -73,9 +67,6 @@ Test_impl::op3 ( ::OBV_TruncatableTest::TValue4_out ov, char *& desc ) -ACE_THROW_SPEC (( - ::CORBA::SystemException -)) { if (TAO_debug_level > 0) ACE_DEBUG((LM_DEBUG, @@ -110,9 +101,6 @@ Test_impl::op4 ( ::OBV_TruncatableTest::TValue1 * iv4, char *& desc ) -ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { if (TAO_debug_level > 0) { @@ -160,9 +148,6 @@ Test_impl::op5 (const CORBA::Any& val, ::OBV_TruncatableTest::TValue1_out ov, char *& desc ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) { ov = new ::OBV_OBV_TruncatableTest::TValue1(); ::OBV_TruncatableTest::TValue1 *iv = 0; @@ -195,7 +180,6 @@ Test_impl::op5 (const CORBA::Any& val, void Test_impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h index 14e2c7bfeee..4c8c6d46218 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h @@ -36,30 +36,21 @@ public: ::OBV_TruncatableTest::BaseValue * iv, ::OBV_TruncatableTest::BaseValue_out ov, char *& desc - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); virtual void op2 ( ::OBV_TruncatableTest::TValue1 * iv, const char * id, ::OBV_TruncatableTest::TValue1_out ov, char *& desc - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); virtual void op3 ( const char * id, ::OBV_TruncatableTest::TValue4 * iv, ::OBV_TruncatableTest::TValue4_out ov, char *& desc - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); virtual ::OBV_TruncatableTest::BaseValue * op4 ( const char * id, @@ -69,22 +60,15 @@ public: ::OBV_TruncatableTest::TValue4 * iv3, ::OBV_TruncatableTest::TValue1 * iv4, char *& desc - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); virtual void op5 (const CORBA::Any& val, const char * id, ::OBV_TruncatableTest::TValue1_out ov, char *& desc - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp index ca91b357be5..6ef251b7b85 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.cpp +++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp @@ -32,7 +32,6 @@ void rotate_string(char *s) VBlong * Test_impl::basic_op1 (VBlong * p1, VBlong *& p2, VBlong_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_RETURN (p3, VBlong (p2->_value()*5), @@ -52,7 +51,6 @@ vb_basic::M_VBlong * Test_impl::basic_op2 (vb_basic::M_VBlong * p1, vb_basic::M_VBlong *& p2, vb_basic::M_VBlong_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_RETURN (p3, vb_basic::M_VBlong (p2->_value()*5), @@ -71,7 +69,6 @@ Test_impl::basic_op2 (vb_basic::M_VBlong * p1, ::CORBA::Long Test_impl::basic_op3 (::CORBA::Long p1, ::CORBA::Long& p2, ::CORBA::Long_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { p3 = p2 * 5; @@ -85,7 +82,6 @@ VBstring * Test_impl::string_op1 (::VBstring * p1, ::VBstring *& p2, ::VBstring_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { rotate_string (p2->_boxed_inout ()); @@ -107,7 +103,6 @@ char * Test_impl::string_op2 (const char * p1, char *& p2, CORBA::String_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { rotate_string (p2); @@ -127,7 +122,6 @@ Test_impl::string_op2 (const char * p1, Test_impl::seq_op1 (::VBseqlong * p1, ::VBseqlong *& p2, ::VBseqlong_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_RETURN (p3, VBseqlong(*p2), @@ -155,7 +149,6 @@ void Test_impl::seq_op2 (const ::TDseqlong & p1, ::TDseqlong & p2, ::TDseqlong_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW (p3, TDseqlong(p1)); @@ -175,7 +168,6 @@ Test_impl::seq_op2 (const ::TDseqlong & p1, Test_impl::struct_op1 (::VBfixed_struct1 * p1, ::VBfixed_struct1 *& p2, ::VBfixed_struct1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_RETURN (p3, VBfixed_struct1 (p2->_value()), @@ -202,7 +194,6 @@ void Test_impl::struct_op2 (const ::Fixed_Struct1 & p1, ::Fixed_Struct1 & p2, ::Fixed_Struct1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { p3 = p1; @@ -215,7 +206,6 @@ Test_impl::struct_op2 (const ::Fixed_Struct1 & p1, Test_impl::struct_op3 (::VBvariable_struct1 * p1, ::VBvariable_struct1 *& p2, ::VBvariable_struct1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // transform p2 values p2->l (p2->l() * 3); @@ -238,7 +228,6 @@ void Test_impl::struct_op4 (const ::Variable_Struct1 & p1, ::Variable_Struct1 & p2, ::Variable_Struct1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW (p3, Variable_Struct1()); @@ -254,7 +243,6 @@ Test_impl::struct_op4 (const ::Variable_Struct1 & p1, Test_impl::array_op1 (::VBlongarray * p1, ::VBlongarray *& p2, ::VBlongarray_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { long array_len = sizeof(LongArray) / sizeof(CORBA::Long); @@ -279,7 +267,6 @@ void Test_impl::array_op2 (const ::LongArray p1, ::LongArray p2, ::LongArray_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { long array_len = sizeof(LongArray) / sizeof(CORBA::Long); @@ -300,7 +287,6 @@ Test_impl::array_op2 (const ::LongArray p1, Test_impl::array_op3 (::VBstringarray * p1, ::VBstringarray *& p2, ::VBstringarray_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { long array_len = sizeof( ::StringArray ) / sizeof( StringArray_slice ); @@ -327,7 +313,6 @@ void Test_impl::array_op4 (const ::StringArray p1, ::StringArray p2, ::StringArray_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { long array_len = sizeof( ::StringArray ) / sizeof( StringArray_slice ); @@ -355,7 +340,6 @@ Test_impl::array_op4 (const ::StringArray p1, Test_impl::union_op1 (::VBfixed_union1 * p1, ::VBfixed_union1 *& p2, ::VBfixed_union1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long longValue; CORBA::Short shortValue; @@ -400,7 +384,6 @@ void Test_impl::union_op2 (const ::Fixed_Union1 & p1, ::Fixed_Union1 & p2, ::Fixed_Union1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { p3 = p1; @@ -420,7 +403,6 @@ Test_impl::union_op2 (const ::Fixed_Union1 & p1, Test_impl::union_op3 (::VBvariable_union1 * p1, ::VBvariable_union1 *& p2, ::VBvariable_union1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Long longValue; CORBA::String_var stringValue; @@ -468,7 +450,6 @@ void Test_impl::union_op4 (const ::Variable_Union1 & p1, ::Variable_Union1 & p2, ::Variable_Union1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var stringValue; @@ -503,7 +484,6 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1, void Test_impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h index ec82e9947b7..179177176be 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.h +++ b/TAO/tests/OBV/ValueBox/Test_impl.h @@ -29,106 +29,86 @@ public: virtual VBlong * basic_op1 ( VBlong * p1, VBlong *& p2, - VBlong_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + VBlong_out p3); virtual vb_basic::M_VBlong * basic_op2(vb_basic::M_VBlong * p1, vb_basic::M_VBlong *& p2, - vb_basic::M_VBlong_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + vb_basic::M_VBlong_out p3); virtual ::CORBA::Long basic_op3 ( ::CORBA::Long p1, ::CORBA::Long& p2, - ::CORBA::Long_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::CORBA::Long_out p3); virtual VBstring * string_op1 (::VBstring * p1, ::VBstring *& p2, - ::VBstring_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::VBstring_out p3); virtual char * string_op2 (const char * p1, char *& p2, - CORBA::String_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::String_out p3); virtual ::VBseqlong * seq_op1 (::VBseqlong * p1, ::VBseqlong *& p2, - ::VBseqlong_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::VBseqlong_out p3); virtual void seq_op2 (const ::TDseqlong & p1, ::TDseqlong & p2, - ::TDseqlong_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::TDseqlong_out p3); virtual ::VBfixed_struct1 * struct_op1 ( ::VBfixed_struct1 * p1, ::VBfixed_struct1 *& p2, - ::VBfixed_struct1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::VBfixed_struct1_out p3); virtual void struct_op2 (const ::Fixed_Struct1 & p1, ::Fixed_Struct1 & p2, - ::Fixed_Struct1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::Fixed_Struct1_out p3); virtual ::VBvariable_struct1 * struct_op3 (::VBvariable_struct1 * p1, ::VBvariable_struct1 *& p2, - ::VBvariable_struct1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::VBvariable_struct1_out p3); virtual void struct_op4 (const ::Variable_Struct1 & p1, ::Variable_Struct1 & p2, - ::Variable_Struct1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::Variable_Struct1_out p3); virtual ::VBlongarray * array_op1 (::VBlongarray * p1, ::VBlongarray *& p2, - ::VBlongarray_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::VBlongarray_out p3); virtual void array_op2 (const ::LongArray p1, ::LongArray p2, - ::LongArray_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::LongArray_out p3); virtual ::VBstringarray * array_op3 (::VBstringarray * p1, ::VBstringarray *& p2, - ::VBstringarray_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::VBstringarray_out p3); virtual void array_op4 (const ::StringArray p1, ::StringArray p2, - ::StringArray_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::StringArray_out p3); virtual ::VBfixed_union1 * union_op1 (::VBfixed_union1 * p1, ::VBfixed_union1 *& p2, - ::VBfixed_union1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::VBfixed_union1_out p3); virtual void union_op2 (const ::Fixed_Union1 & p1, ::Fixed_Union1 & p2, - ::Fixed_Union1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::Fixed_Union1_out p3); virtual ::VBvariable_union1 * union_op3 (::VBvariable_union1 * p1, ::VBvariable_union1 *& p2, - ::VBvariable_union1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::VBvariable_union1_out p3); virtual void union_op4 (const ::Variable_Union1 & p1, ::Variable_Union1 & p2, - ::Variable_Union1_out p3) - ACE_THROW_SPEC ((CORBA::SystemException)); + ::Variable_Union1_out p3); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp index 69430847582..3721c755bf0 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp @@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp index 5be30781a60..bcca46eeec7 100644 --- a/TAO/tests/ORB_init/Portspan/simpleI.cpp +++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp @@ -33,9 +33,6 @@ simple_i::~simple_i (void) void simple_i::test ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { //Add your implementation here } diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h index 581c88f8aa0..2136a1d1135 100644 --- a/TAO/tests/ORB_init/Portspan/simpleI.h +++ b/TAO/tests/ORB_init/Portspan/simpleI.h @@ -39,10 +39,7 @@ public: virtual ~simple_i (void); virtual void test ( - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); }; diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp index 3287952f4e2..0aee1dc29e7 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp @@ -16,14 +16,12 @@ ORT_test_IORInterceptor::ORT_test_IORInterceptor (void) char * ORT_test_IORInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ORT_IORInterceptor"); } void ORT_test_IORInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (this->establish_count_ > 0 && this->components_establish_count_ > 0 @@ -33,7 +31,6 @@ ORT_test_IORInterceptor::destroy (void) void ORT_test_IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr /* info */) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->establish_count_; @@ -45,7 +42,6 @@ ORT_test_IORInterceptor::establish_components ( void ORT_test_IORInterceptor::components_established ( PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++this->components_establish_count_; @@ -78,7 +74,6 @@ void ORT_test_IORInterceptor::adapter_manager_state_changed ( const char * id, PortableInterceptor::AdapterState) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "The AdapterManager [id=%s] state has changed.\n", id)); @@ -88,6 +83,5 @@ void ORT_test_IORInterceptor:: adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, PortableInterceptor::AdapterState) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h index 40a7a2968f3..995cc77a3e6 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.h +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h @@ -47,31 +47,25 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Add the tagged components to the IOR. virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::IORInfo_ptr info); virtual void components_established ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::IORInfo_ptr info); virtual void adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::AdapterState state); virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::AdapterState state); //@} diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp index 7d0dc6b4a6f..3477dd25651 100644 --- a/TAO/tests/ORT/ORT_test_i.cpp +++ b/TAO/tests/ORT/ORT_test_i.cpp @@ -13,14 +13,12 @@ ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb) CORBA::Boolean ORT_test_i::request_server (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } void ORT_test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h index 582438e8795..55aef41d1a9 100644 --- a/TAO/tests/ORT/ORT_test_i.h +++ b/TAO/tests/ORT/ORT_test_i.h @@ -26,11 +26,9 @@ public: ORT_test_i (CORBA::ORB_ptr orb); - virtual CORBA::Boolean request_server (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Boolean request_server (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp index 13c12219c2b..054801c2c7e 100644 --- a/TAO/tests/ORT/ServerORBInitializer.cpp +++ b/TAO/tests/ORT/ServerORBInitializer.cpp @@ -14,14 +14,12 @@ ACE_RCSID (ORT, void ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = diff --git a/TAO/tests/ORT/ServerORBInitializer.h b/TAO/tests/ORT/ServerORBInitializer.h index 6f5d85861ab..016a56fba86 100644 --- a/TAO/tests/ORT/ServerORBInitializer.h +++ b/TAO/tests/ORT/ServerORBInitializer.h @@ -51,13 +51,11 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); //@} }; diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp index 6e4b4eee5ac..6f502932c60 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.cpp +++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp @@ -20,30 +20,24 @@ ServerRequestInterceptor::ServerRequestInterceptor ( char * ServerRequestInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void ServerRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // If no response is expected, then we're invoking the oneway // shutdown operation. Don't bother displaying output a second @@ -120,22 +114,17 @@ ServerRequestInterceptor::receive_request ( void ServerRequestInterceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h index afa56c964ca..2c512632061 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.h +++ b/TAO/tests/ORT/ServerRequestInterceptor.h @@ -65,35 +65,24 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp index 953d57e77f3..245b041521a 100644 --- a/TAO/tests/Object_Loader/Loader.cpp +++ b/TAO/tests/Object_Loader/Loader.cpp @@ -13,7 +13,6 @@ CORBA::Object_ptr Loader::create_object (CORBA::ORB_ptr orb, int, char * []) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h index 47c39d4e32c..0e7329ad627 100644 --- a/TAO/tests/Object_Loader/Loader.h +++ b/TAO/tests/Object_Loader/Loader.h @@ -32,8 +32,7 @@ public: virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, - char *argv []) - ACE_THROW_SPEC ((CORBA::SystemException)); + char *argv []); // Create a new instance }; diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp index 7271b79e988..f0f147c9f96 100644 --- a/TAO/tests/Object_Loader/Test_i.cpp +++ b/TAO/tests/Object_Loader/Test_i.cpp @@ -15,14 +15,12 @@ Test_i::Test_i (PortableServer::POA_ptr poa) CORBA::Long Test_i::instance_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return Test_i::instance_count_; } void Test_i::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_var poa = this->_default_POA (); @@ -33,7 +31,6 @@ Test_i::destroy (void) PortableServer::POA_ptr Test_i::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h index c1d920b2c7b..e9a7edf00bb 100644 --- a/TAO/tests/Object_Loader/Test_i.h +++ b/TAO/tests/Object_Loader/Test_i.h @@ -30,14 +30,11 @@ public: Test_i (PortableServer::POA_ptr poa); // ctor - CORBA::Long instance_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long instance_count (void); - void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy (void); - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr _default_POA (void); private: PortableServer::POA_var poa_; diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 8b618bb40f1..04d6a413ec9 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -13,14 +13,11 @@ public: CORBA::ORB_ptr orb); void CreateExtra (CORBA::ULong length, - ServerSequence_out seq) - ACE_THROW_SPEC ((CORBA::SystemException)); + ServerSequence_out seq); - void DeleteExtra (const ServerSequence &seq) - ACE_THROW_SPEC ((CORBA::SystemException)); + void DeleteExtra (const ServerSequence &seq); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: /// Our root POA @@ -42,7 +39,6 @@ ServerServant::ServerServant (PortableServer::POA_ptr poa, void ServerServant::CreateExtra (CORBA::ULong len, ServerSequence_out seq) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Create extra called with " @@ -77,7 +73,6 @@ ServerServant::CreateExtra (CORBA::ULong len, void ServerServant::DeleteExtra (const ServerSequence &seq) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Deleting sequences \n")); @@ -106,7 +101,6 @@ ServerServant::DeleteExtra (const ServerSequence &seq) void ServerServant::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp index dd1e42054e4..19d94f713d0 100644 --- a/TAO/tests/OctetSeq/test_i.cpp +++ b/TAO/tests/OctetSeq/test_i.cpp @@ -19,7 +19,6 @@ Database_i::set (Test::Index i, const Test::OctetSeq& seq, CORBA::Double verification_token, CORBA::Double_out returned_token) - ACE_THROW_SPEC ((Test::OutOfRange)) { if (i >= this->max_range_) throw Test::OutOfRange (0, this->max_range_); @@ -45,7 +44,6 @@ Database_i::set (Test::Index i, Test::OctetSeq* Database_i::get (Test::Index i) - ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)) { if (i >= this->max_range_) throw Test::OutOfRange (0, this->max_range_); @@ -59,7 +57,6 @@ Database_i::get (Test::Index i) CORBA::ULong Database_i::get_crc (Test::Index i) - ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)) { if (i >= this->max_range_) throw Test::OutOfRange (0, this->max_range_); @@ -70,7 +67,6 @@ Database_i::get_crc (Test::Index i) void Database_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h index 4d7b846d38d..1269850b911 100644 --- a/TAO/tests/OctetSeq/test_i.h +++ b/TAO/tests/OctetSeq/test_i.h @@ -35,17 +35,13 @@ public: void set (Test::Index i, const Test::OctetSeq& seq, CORBA::Double verification_token, - CORBA::Double_out returned_token) - ACE_THROW_SPEC ((Test::OutOfRange)); + CORBA::Double_out returned_token); - Test::OctetSeq* get (Test::Index i) - ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)); + Test::OctetSeq* get (Test::Index i); - CORBA::ULong get_crc (Test::Index i) - ACE_THROW_SPEC ((CORBA::SystemException,Test::OutOfRange)); + CORBA::ULong get_crc (Test::Index i); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp index bfd8274359a..a2a4d8ae380 100644 --- a/TAO/tests/Ondemand_Write/Hello.cpp +++ b/TAO/tests/Ondemand_Write/Hello.cpp @@ -16,14 +16,12 @@ Hello::get_string ( const char * inputa, ::CORBA::Long , const char * ) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (inputa); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h index 2cd11fd1b71..9f8734f5684 100644 --- a/TAO/tests/Ondemand_Write/Hello.h +++ b/TAO/tests/Ondemand_Write/Hello.h @@ -21,11 +21,9 @@ public: ::CORBA::Long valuea, const char * inputa, ::CORBA::Long valueb, - const char * inputb) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char * inputb); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp index 16db8fe73e2..698098675db 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp @@ -14,27 +14,23 @@ Oneway_Buffering::Oneway_Buffering (CORBA::ORB_ptr orb, void Oneway_Buffering::receive_data (const Test::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->admin_->request_received (the_payload.length ()); } void Oneway_Buffering::flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Oneway_Buffering::sync (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->admin_->flush (); } void Oneway_Buffering::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h index 9b32c9e4d58..b201e475f14 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h @@ -18,17 +18,13 @@ public: Test::Oneway_Buffering_Admin_ptr admin); // = The skeleton methods - virtual void receive_data (const Test::Payload &the_payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_data (const Test::Payload &the_payload); - virtual void flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void flush (void); - virtual void sync (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void sync (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp index 1525b0f0905..9f4733ac4e3 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp @@ -14,21 +14,18 @@ Oneway_Buffering_Admin::Oneway_Buffering_Admin (CORBA::ORB_ptr orb) CORBA::ULong Oneway_Buffering_Admin::request_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->request_count_; } CORBA::ULong Oneway_Buffering_Admin::bytes_received_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->bytes_received_count_; } void Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->request_count_++; this->bytes_received_count_ += payload_length; @@ -36,13 +33,11 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length) void Oneway_Buffering_Admin::flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Oneway_Buffering_Admin::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h index 02272fd53bf..738b6d1f597 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h @@ -17,20 +17,15 @@ public: Oneway_Buffering_Admin (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong request_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong request_count (void); - virtual CORBA::ULong bytes_received_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong bytes_received_count (void); - virtual void request_received (CORBA::ULong payload_length) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void request_received (CORBA::ULong payload_length); - virtual void flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void flush (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/Oneway_Timeouts/server.cpp b/TAO/tests/Oneway_Timeouts/server.cpp index c84c0745c28..0df5c20605d 100644 --- a/TAO/tests/Oneway_Timeouts/server.cpp +++ b/TAO/tests/Oneway_Timeouts/server.cpp @@ -43,13 +43,11 @@ public: } virtual void test (CORBA::Long id) - ACE_THROW_SPEC ((::CORBA::SystemException)) { testShared (id); } virtual CORBA::Long test2 (CORBA::Long id) - ACE_THROW_SPEC ((::CORBA::SystemException)) { if (id == -2) { @@ -227,9 +225,9 @@ namespace { abort_after = ACE_OS::atoi (args.get_current ()); args.consume_arg (); } - else + else { - cerr << "Error: Unknown argument \"" + cerr << "Error: Unknown argument \"" << args.get_current () << "\"" << endl; print_usage (); return false; @@ -254,7 +252,7 @@ namespace { pols[0] = root->create_id_assignment_policy (PortableServer::USER_ID); pols[1] = root->create_lifespan_policy (PortableServer::PERSISTENT); POAManager_var man = root->the_POAManager (); - POA_var poa = root->create_POA ("X", man.in (), pols); + POA_var poa = root->create_POA ("X", man.in (), pols); return poa._retn (); } @@ -309,7 +307,7 @@ int main (int ac, char *av[]) return 0; - } + } catch (CORBA::Exception &ex) { ex._tao_print_exception ("server:"); diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index d9d5b1c20a6..4ece8c08df7 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -20,7 +20,6 @@ Receiver_i::~Receiver_i (void) CORBA::Long Receiver_i::receive_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Doing a ping... \n")); @@ -32,7 +31,6 @@ Receiver_i::receive_call (void) CORBA::Long Receiver_i::get_call_count ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->iteration_; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index cbd618db0a4..2878f61b637 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -33,12 +33,10 @@ public: virtual ~Receiver_i (void); // = The skeleton methods - virtual CORBA::Long receive_call (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long receive_call (void); /// Retun the number of calls that every thread would make... - virtual CORBA::Long get_call_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long get_call_count (void); private: /// Our Orb... diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp index 9e4cf2f22e3..ae50a6b64eb 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp @@ -17,7 +17,6 @@ Sender_i::~Sender_i (void) void Sender_i::active_objects (CORBA::Short no_threads /* */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->active_objects_ = no_threads; } @@ -25,7 +24,6 @@ Sender_i::active_objects (CORBA::Short no_threads void Sender_i::send_ready_message (Test::Receiver_ptr receiver) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Received a call ...\n")); @@ -44,7 +42,6 @@ Sender_i::send_ready_message (Test::Receiver_ptr receiver) void Sender_i::ping ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { return; } diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 57ea386f763..8bb227053e8 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -33,14 +33,11 @@ public: virtual ~Sender_i (void); // = The skeleton methods - virtual void active_objects (CORBA::Short ao) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void active_objects (CORBA::Short ao); - virtual void send_ready_message (Test::Receiver_ptr receiver) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_ready_message (Test::Receiver_ptr receiver); - virtual void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void ping (void); private: /// Our local ORB ptr diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp index 715b1b85a73..3fd6da6766f 100644 --- a/TAO/tests/POA/Bug_2511_Regression/server.cpp +++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp @@ -32,14 +32,11 @@ public: test_i (PortableServer::POA_ptr poa); - void normal (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal (void); - void exceptional (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void exceptional (void); - void notexisting (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void notexisting (void); PortableServer::POA_var poa_; }; @@ -51,21 +48,18 @@ test_i::test_i (PortableServer::POA_ptr poa) void test_i::normal (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing normal\n")); } void test_i::exceptional (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing exceptional\n")); } void test_i::notexisting (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "executing notexisting\n")); } @@ -80,16 +74,13 @@ public: ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr, const char *, - PortableServer::ServantLocator::Cookie &) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::ServantLocator::Cookie &); void postinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr, const char *, PortableServer::ServantLocator::Cookie, - PortableServer::Servant) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::Servant); test_i servant_; }; @@ -104,8 +95,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, const char *op, PortableServer::ServantLocator::Cookie &) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { CORBA::String_var name = PortableServer::ObjectId_to_string (oid); @@ -137,7 +126,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, const char *op, PortableServer::ServantLocator::Cookie, PortableServer::Servant) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++postCount; CORBA::String_var name = diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp index 399e615c228..f6380be5ae2 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.cpp +++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp @@ -12,7 +12,6 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h index 436fdfcd77f..b81881e71cb 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.h +++ b/TAO/tests/POA/Deactivate_Object/Hello.h @@ -17,8 +17,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp index 3bb0a772b76..df5dc90d3d9 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.cpp +++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp @@ -12,14 +12,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.h +++ b/TAO/tests/POA/EndpointPolicy/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index fdb86bda753..f4fc6dd47c1 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -25,7 +25,6 @@ class test_i : public POA_test { public: void method ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,7 +39,6 @@ class test_i_with_reference_counting : { public: void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -54,23 +52,18 @@ class Servant_Activator : public PortableServer::ServantActivator { public: PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::POA_ptr poa); void etherealize (const PortableServer::ObjectId &oid, 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); }; PortableServer::Servant Servant_Activator::incarnate (const PortableServer::ObjectId &id, PortableServer::POA_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { CORBA::String_var object_name = PortableServer::ObjectId_to_string (id); @@ -93,7 +86,6 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var object_name = PortableServer::ObjectId_to_string (id); diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 1bdba102e50..36589971b19 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -24,8 +24,7 @@ class test_i : public POA_test { public: - void deactivate_self (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void deactivate_self (void); PortableServer::POA_ptr _default_POA (void); @@ -42,7 +41,6 @@ test_i::_default_POA ( /**/) void test_i::deactivate_self (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->poa_->deactivate_object (this->id_); diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 1962a84a629..c60a1aa60ec 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -30,8 +30,7 @@ public: test_i (PortableServer::POA_ptr poa); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); PortableServer::POA_var poa_; }; @@ -43,7 +42,6 @@ test_i::test_i (PortableServer::POA_ptr poa) void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -90,16 +88,13 @@ public: ::PortableServer::Servant preinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr, const char *, - PortableServer::ServantLocator::Cookie &) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::ServantLocator::Cookie &); void postinvoke (const PortableServer::ObjectId &, PortableServer::POA_ptr, const char *, PortableServer::ServantLocator::Cookie, - PortableServer::Servant) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::Servant); test_i servant_; }; @@ -114,8 +109,6 @@ Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr, const char *, PortableServer::ServantLocator::Cookie &) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { CORBA::String_var name = PortableServer::ObjectId_to_string (oid); @@ -148,7 +141,6 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid, const char *, PortableServer::ServantLocator::Cookie, PortableServer::Servant) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name = PortableServer::ObjectId_to_string (oid); diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index 4e484a4119f..531e9b29c1f 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -31,8 +31,7 @@ public: ~test_i (void); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); PortableServer::POA_var poa_; @@ -55,7 +54,6 @@ test_i::~test_i (void) void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -119,16 +117,13 @@ public: Servant_Activator (PortableServer::POA_ptr poa); PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)); + PortableServer::POA_ptr poa); void etherealize (const PortableServer::ObjectId &oid, 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); PortableServer::POA_var poa_; @@ -144,8 +139,6 @@ Servant_Activator::Servant_Activator (PortableServer::POA_ptr poa) PortableServer::Servant Servant_Activator::incarnate (const PortableServer::ObjectId &, PortableServer::POA_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::ForwardRequest)) { test_i *servant = new test_i (this->poa_.in ()); @@ -198,7 +191,6 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &, PortableServer::Servant servant, CORBA::Boolean, CORBA::Boolean) - ACE_THROW_SPEC ((CORBA::SystemException)) { servant->_remove_ref (); } diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 98a931f25e0..af13f7107c1 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -56,8 +56,7 @@ class test_i : public POA_test public: test_i (ACE_Auto_Event &event); - void deactivate_self (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void deactivate_self (void); private: ACE_Auto_Event &event_; @@ -70,7 +69,6 @@ test_i::test_i (ACE_Auto_Event &event) void test_i::deactivate_self (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_var poa = this->_default_POA (); diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp index 899d8fae6ee..1a55e2655b0 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -22,13 +22,11 @@ class test_i : public POA_test { public: - void destroy_poa (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy_poa (void); }; void test_i::destroy_poa (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_var poa = this->_default_POA (); diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 4a947ab13cc..0c6a6904565 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -31,17 +31,13 @@ public: test_i (CORBA::ORB_ptr orb_ptr, PortableServer::POA_ptr poa); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); - test_ptr create_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + test_ptr create_POA (void); - void destroy_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy_POA (void); PortableServer::POA_ptr _default_POA (void); @@ -61,7 +57,6 @@ test_i::test_i (CORBA::ORB_ptr orb, void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent"); @@ -82,7 +77,6 @@ test_i::method (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } @@ -95,7 +89,6 @@ test_i::_default_POA (void) test_ptr test_i::create_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::PolicyList policies (2); policies.length (2); @@ -148,7 +141,6 @@ test_i::create_POA (void) void test_i::destroy_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->child_poa_->destroy (1, 0); } diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp index c120a070010..8c0d26b8abc 100644 --- a/TAO/tests/POA/Reference_Counting/test.cpp +++ b/TAO/tests/POA/Reference_Counting/test.cpp @@ -22,9 +22,6 @@ public: virtual void moo ( ) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { } }; diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index 7626b224f3c..7805df22d59 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -28,8 +28,7 @@ class test_i : public virtual POA_test public: test_i (PortableServer::POA_ptr poa); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); PortableServer::POA_ptr _default_POA (void); @@ -46,7 +45,6 @@ test_i::test_i (PortableServer::POA_ptr poa) void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Entering Worker::svc from %t and sleeping....\n")); diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index b640b83b7c6..63628a5be4c 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -21,8 +21,7 @@ class test_i : public POA_test { public: - void destroy_poa (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void destroy_poa (void); void test_poa (PortableServer::POA_ptr poa); @@ -37,7 +36,6 @@ test_i::test_poa (PortableServer::POA_ptr poa) void test_i::destroy_poa (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean etherealize_objects = 1; CORBA::Boolean wait_for_completion = 1; diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp index b446a7fbe94..0a5be851783 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp @@ -10,14 +10,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h index 244529328a9..516e746b2f9 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h +++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h @@ -19,11 +19,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index c7fa1976fc1..0b6ca851cd5 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -41,7 +41,6 @@ Coffee_i::~Coffee_i (void) // get attribute Coffee::Desc * Coffee_i::description ( /*env*/) - ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee::Desc *desc = new Coffee::Desc; desc->name = CORBA::string_dup (this->name_.in ()); @@ -52,7 +51,6 @@ Coffee_i::description ( /*env*/) void Coffee_i::description (const Coffee::Desc &description /*env*/) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->name_ = CORBA::string_dup (description.name); } @@ -80,7 +78,6 @@ CORBA::Short Param_Test_i::test_short (CORBA::Short s1, CORBA::Short &s2, CORBA::Short_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = (CORBA::Short) (s1 * 2); s3 = (CORBA::Short) (s1 * 3); @@ -98,7 +95,6 @@ CORBA::ULongLong Param_Test_i::test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, CORBA::ULongLong_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1 * 2; s3 = s1 * 3; @@ -112,7 +108,6 @@ char * Param_Test_i::test_unbounded_string (const char *s1, char *&s2, CORBA::String_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); s3 = CORBA::string_dup (s1); @@ -130,7 +125,6 @@ char * Param_Test_i::test_bounded_string (const char *s1, char *&s2, CORBA::String_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { char *retstr = CORBA::string_dup (s1); s3 = CORBA::string_dup (s1); @@ -148,7 +142,6 @@ CORBA::WChar * Param_Test_i::test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, CORBA::WString_out ws3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); ws3 = CORBA::wstring_dup (ws1); @@ -170,7 +163,6 @@ CORBA::WChar * Param_Test_i::test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, CORBA::WString_out ws3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::WChar *retwstr = CORBA::wstring_dup (ws1); ws3 = CORBA::wstring_dup (ws1); @@ -190,7 +182,6 @@ Param_Test::Fixed_Struct Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, Param_Test::Fixed_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { s2 = s1; s3 = s1; @@ -203,7 +194,6 @@ CORBA::LongSeq * Param_Test_i::test_long_sequence (const CORBA::LongSeq & s1, CORBA::LongSeq & s2, CORBA::LongSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::LongSeq *ret = new CORBA::LongSeq, @@ -220,7 +210,6 @@ CORBA::ShortSeq * Param_Test_i::test_short_sequence (const CORBA::ShortSeq & s1, CORBA::ShortSeq & s2, CORBA::ShortSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ShortSeq *ret = new CORBA::ShortSeq, @@ -237,7 +226,6 @@ Param_Test::Bounded_Short_Seq * Param_Test_i::test_bounded_short_sequence (const Param_Test::Bounded_Short_Seq & s1, Param_Test::Bounded_Short_Seq & s2, Param_Test::Bounded_Short_Seq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Short_Seq *ret = new Param_Test::Bounded_Short_Seq, @@ -254,7 +242,6 @@ Param_Test::Bounded_Long_Seq * Param_Test_i::test_bounded_long_sequence (const Param_Test::Bounded_Long_Seq & s1, Param_Test::Bounded_Long_Seq & s2, Param_Test::Bounded_Long_Seq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Long_Seq *ret = new Param_Test::Bounded_Long_Seq, @@ -271,7 +258,6 @@ CORBA::StringSeq * Param_Test_i::test_strseq (const CORBA::StringSeq &s1, CORBA::StringSeq &s2, CORBA::StringSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -306,7 +292,6 @@ Param_Test::Bounded_StrSeq * Param_Test_i::test_bounded_strseq (const Param_Test::Bounded_StrSeq & s1, Param_Test::Bounded_StrSeq & s2, Param_Test::Bounded_StrSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -326,7 +311,6 @@ CORBA::WStringSeq * Param_Test_i::test_wstrseq (const CORBA::WStringSeq &ws1, CORBA::WStringSeq &ws2, CORBA::WStringSeq_out ws3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -346,7 +330,6 @@ Param_Test::Bounded_WStrSeq * Param_Test_i::test_bounded_wstrseq (const Param_Test::Bounded_WStrSeq & ws1, Param_Test::Bounded_WStrSeq & ws2, Param_Test::Bounded_WStrSeq_out ws3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -367,7 +350,6 @@ Param_Test::StructSeq * Param_Test_i::test_struct_sequence (const Param_Test::StructSeq &s1, Param_Test::StructSeq &s2, Param_Test::StructSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -389,7 +371,6 @@ Param_Test::Bounded_StructSeq * Param_Test_i::test_bounded_struct_sequence (const Param_Test::Bounded_StructSeq & s1, Param_Test::Bounded_StructSeq & s2, Param_Test::Bounded_StructSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_StructSeq *ret = new Param_Test::Bounded_StructSeq, @@ -407,7 +388,6 @@ Param_Test::PathSpec * Param_Test_i::test_unbounded_struct_sequence (const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, Param_Test::PathSpec_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::PathSpec *ret = new Param_Test::PathSpec, @@ -439,7 +419,6 @@ Param_Test::ArraySeq * Param_Test_i::test_array_sequence (const Param_Test::ArraySeq &s1, Param_Test::ArraySeq &s2, Param_Test::ArraySeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -461,7 +440,6 @@ Param_Test::Bounded_ArraySeq * Param_Test_i::test_bounded_array_sequence (const Param_Test::Bounded_ArraySeq & s1, Param_Test::Bounded_ArraySeq & s2, Param_Test::Bounded_ArraySeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_ArraySeq *ret = new Param_Test::Bounded_ArraySeq, @@ -478,7 +456,6 @@ Param_Test::Coffee_Mix * Param_Test_i::test_coffe_mix (const Param_Test::Coffee_Mix & s1, Param_Test::Coffee_Mix & s2, Param_Test::Coffee_Mix_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Coffee_Mix *ret = new Param_Test::Coffee_Mix, @@ -520,7 +497,6 @@ Param_Test::Bounded_Coffee_Mix * Param_Test_i::test_bounded_coffe_mix (const Param_Test::Bounded_Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix & s2, Param_Test::Bounded_Coffee_Mix_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Bounded_Coffee_Mix *ret = new Param_Test::Bounded_Coffee_Mix, @@ -562,7 +538,6 @@ CORBA::AnySeq * Param_Test_i::test_anyseq (const CORBA::AnySeq &s1, CORBA::AnySeq &s2, CORBA::AnySeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -585,7 +560,6 @@ Param_Test::Var_Struct * Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, Param_Test::Var_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -606,7 +580,6 @@ Param_Test::Nested_Struct * Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, Param_Test::Nested_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -627,7 +600,6 @@ Param_Test::Recursive_Struct * Param_Test_i::test_recursive_struct (const Param_Test::Recursive_Struct &s1, Param_Test::Recursive_Struct &s2, Param_Test::Recursive_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" structs into all the inout, out and return sequences. @@ -647,7 +619,6 @@ Param_Test::Objref_Struct * Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, Param_Test::Objref_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we copy the "in" sequences into all the inout, out and return sequences. @@ -666,7 +637,6 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, // make a Coffee object Coffee_ptr Param_Test_i::make_coffee (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->obj_._this (); } @@ -676,7 +646,6 @@ Coffee_ptr Param_Test_i::test_objref (Coffee_ptr o1, Coffee_ptr &o2, Coffee_out o3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Coffee_ptr ret = Coffee::_nil (); @@ -721,7 +690,6 @@ Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &t2, CORBA::TypeCode_out t3 /*env*/) - ACE_THROW_SPEC ((CORBA::SystemException)) { // we simply assign t1 to the others CORBA::TypeCode_ptr retval = CORBA::TypeCode::_duplicate (t1); @@ -735,7 +703,6 @@ CORBA::Any * Param_Test_i::test_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any *ret; CORBA::Short short_in; @@ -900,7 +867,6 @@ Param_Test::Fixed_Array_slice * Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, Param_Test::Fixed_Array_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Fixed_Array_slice *ret; @@ -915,7 +881,6 @@ Param_Test::Var_Array_slice * Param_Test_i::test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, Param_Test::Var_Array_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Var_Array_slice *ret; @@ -929,8 +894,6 @@ CORBA::ULong Param_Test_i::test_exception (CORBA::ULong s1, CORBA::ULong& s2, CORBA::ULong_out s3) - ACE_THROW_SPEC ((CORBA::SystemException, - Param_Test::Ooops)) { CORBA::ULong d = s1 % 4; @@ -966,7 +929,6 @@ Param_Test::Big_Union* Param_Test_i::test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, Param_Test::Big_Union_out u3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1)); u2 = u1; @@ -978,7 +940,6 @@ Param_Test::Small_Union Param_Test_i::test_small_union (const Param_Test::Small_Union& u1, Param_Test::Small_Union& u2, Param_Test::Small_Union_out u3) - ACE_THROW_SPEC ((CORBA::SystemException)) { u2 = u1; u3 = u1; @@ -989,7 +950,6 @@ Param_Test::Recursive_Union* Param_Test_i::test_recursive_union (const Param_Test::Recursive_Union& ru1, Param_Test::Recursive_Union& ru2, Param_Test::Recursive_Union_out ru3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Recursive_Union_var ret (new Param_Test::Recursive_Union (ru1)); ru2 = ru1; @@ -1001,7 +961,6 @@ CORBA::Any* Param_Test_i::test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, CORBA::Any_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Any_var ret (new CORBA::Any (a1)); a2 = a1; @@ -1013,7 +972,6 @@ Param_Test::Multdim_Array_slice * Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, Param_Test::Multdim_Array a2, Param_Test::Multdim_Array_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)) { Param_Test::Multdim_Array_slice *ret; @@ -1025,7 +983,6 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, void Param_Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index 500fa3ad36f..321df2bb9b3 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -31,12 +31,10 @@ public: // =methods for the attribute - virtual Coffee::Desc * description (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Coffee::Desc * description (void); // get attribute - virtual void description (const Coffee::Desc &description) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void description (const Coffee::Desc &description); // set attribute private: @@ -61,236 +59,195 @@ public: virtual CORBA::Short test_short (CORBA::Short s1, CORBA::Short &s2, - CORBA::Short_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short_out s3); // test for shorts virtual CORBA::ULongLong test_ulonglong (CORBA::ULongLong s1, CORBA::ULongLong &s2, - CORBA::ULongLong_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULongLong_out s3); // test for unsigned long long virtual char *test_unbounded_string (const char *s1, char *&s2, - CORBA::String_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::String_out s3); // test for unbounded strings virtual char *test_bounded_string (const char *s1, char *&s2, - CORBA::String_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::String_out s3); // test for bounded strings virtual CORBA::WChar *test_unbounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::WString_out ws3); // test for unbounded wstrings virtual CORBA::WChar *test_bounded_wstring (const CORBA::WChar *ws1, CORBA::WChar *&ws2, - CORBA::WString_out ws3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::WString_out ws3); // test for bounded wstrings virtual Param_Test::Fixed_Struct test_fixed_struct (const Param_Test::Fixed_Struct &s1, Param_Test::Fixed_Struct &s2, - Param_Test::Fixed_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Fixed_Struct_out s3); // test for fixed structures // = Start of sequences tests... virtual CORBA::LongSeq * test_long_sequence ( const CORBA::LongSeq & s1, CORBA::LongSeq & s2, - CORBA::LongSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::LongSeq_out s3); virtual Param_Test::Bounded_Long_Seq * test_bounded_long_sequence ( const Param_Test::Bounded_Long_Seq & s1, Param_Test::Bounded_Long_Seq & s2, - Param_Test::Bounded_Long_Seq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Bounded_Long_Seq_out s3); virtual CORBA::ShortSeq * test_short_sequence ( const CORBA::ShortSeq & s1, CORBA::ShortSeq & s2, - CORBA::ShortSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ShortSeq_out s3); virtual Param_Test::Bounded_Short_Seq * test_bounded_short_sequence ( const Param_Test::Bounded_Short_Seq & s1, Param_Test::Bounded_Short_Seq & s2, - Param_Test::Bounded_Short_Seq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Bounded_Short_Seq_out s3); virtual CORBA::StringSeq * test_strseq ( const CORBA::StringSeq & s1, CORBA::StringSeq & s2, - CORBA::StringSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::StringSeq_out s3); virtual Param_Test::Bounded_StrSeq * test_bounded_strseq ( const Param_Test::Bounded_StrSeq & s1, Param_Test::Bounded_StrSeq & s2, - Param_Test::Bounded_StrSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Bounded_StrSeq_out s3); virtual CORBA::WStringSeq * test_wstrseq ( const CORBA::WStringSeq & ws1, CORBA::WStringSeq & ws2, - CORBA::WStringSeq_out ws3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::WStringSeq_out ws3); virtual Param_Test::Bounded_WStrSeq * test_bounded_wstrseq ( const Param_Test::Bounded_WStrSeq & ws1, Param_Test::Bounded_WStrSeq & ws2, - Param_Test::Bounded_WStrSeq_out ws3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Bounded_WStrSeq_out ws3); virtual Param_Test::StructSeq * test_struct_sequence ( const Param_Test::StructSeq & s1, Param_Test::StructSeq & s2, - Param_Test::StructSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::StructSeq_out s3); virtual Param_Test::PathSpec * test_unbounded_struct_sequence ( const Param_Test::PathSpec & s1, Param_Test::PathSpec & s2, - Param_Test::PathSpec_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::PathSpec_out s3); virtual Param_Test::Bounded_StructSeq * test_bounded_struct_sequence ( const Param_Test::Bounded_StructSeq & s1, Param_Test::Bounded_StructSeq & s2, - Param_Test::Bounded_StructSeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Bounded_StructSeq_out s3); virtual Param_Test::ArraySeq * test_array_sequence ( const Param_Test::ArraySeq & s1, Param_Test::ArraySeq & s2, - Param_Test::ArraySeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::ArraySeq_out s3); virtual Param_Test::Bounded_ArraySeq * test_bounded_array_sequence ( const Param_Test::Bounded_ArraySeq & s1, Param_Test::Bounded_ArraySeq & s2, - Param_Test::Bounded_ArraySeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Bounded_ArraySeq_out s3); virtual Param_Test::Coffee_Mix * test_coffe_mix ( const Param_Test::Coffee_Mix & s1, Param_Test::Coffee_Mix & s2, - Param_Test::Coffee_Mix_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Coffee_Mix_out s3); virtual Param_Test::Bounded_Coffee_Mix * test_bounded_coffe_mix ( const Param_Test::Bounded_Coffee_Mix & s1, Param_Test::Bounded_Coffee_Mix & s2, - Param_Test::Bounded_Coffee_Mix_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Bounded_Coffee_Mix_out s3); virtual CORBA::AnySeq * test_anyseq ( const CORBA::AnySeq & s1, CORBA::AnySeq & s2, - CORBA::AnySeq_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::AnySeq_out s3); // = End of sequences tests.... virtual Param_Test::Var_Struct * test_var_struct (const Param_Test::Var_Struct &s1, Param_Test::Var_Struct &s2, - Param_Test::Var_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Var_Struct_out s3); // test for variable structs virtual Param_Test::Nested_Struct * test_nested_struct (const Param_Test::Nested_Struct &s1, Param_Test::Nested_Struct &s2, - Param_Test::Nested_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Nested_Struct_out s3); // test for nested structs virtual Param_Test::Recursive_Struct * test_recursive_struct (const Param_Test::Recursive_Struct &rs1, Param_Test::Recursive_Struct &rs2, - Param_Test::Recursive_Struct_out rs3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Recursive_Struct_out rs3); // test for recursive structs virtual Param_Test::Objref_Struct * test_objref_struct (const Param_Test::Objref_Struct &s1, Param_Test::Objref_Struct &s2, - Param_Test::Objref_Struct_out s3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Objref_Struct_out s3); virtual Coffee_ptr - make_coffee (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + make_coffee (void); // make a coffee object virtual Coffee_ptr test_objref (Coffee_ptr o1, Coffee_ptr &o2, - Coffee_out o3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Coffee_out o3); // test for object references virtual CORBA::TypeCode_ptr test_typecode (CORBA::TypeCode_ptr t1, CORBA::TypeCode_ptr &o2, - CORBA::TypeCode_out o3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::TypeCode_out o3); // test for typecodes virtual CORBA::Any * test_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Any_out a3); // test for Anys virtual Param_Test::Fixed_Array_slice * test_fixed_array (const Param_Test::Fixed_Array a1, Param_Test::Fixed_Array a2, - Param_Test::Fixed_Array_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Fixed_Array_out a3); // test for fixed size arrays virtual Param_Test::Var_Array_slice * test_var_array (const Param_Test::Var_Array a1, Param_Test::Var_Array a2, - Param_Test::Var_Array_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Var_Array_out a3); // test for arrays of variable types virtual CORBA::ULong test_exception (CORBA::ULong s1, CORBA::ULong& s2, - CORBA::ULong_out s3) - ACE_THROW_SPEC ((CORBA::SystemException, - Param_Test::Ooops)); + CORBA::ULong_out s3); virtual Param_Test::Big_Union* test_big_union (const Param_Test::Big_Union& u1, Param_Test::Big_Union& u2, - Param_Test::Big_Union_out u3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Big_Union_out u3); virtual Param_Test::Small_Union test_small_union (const Param_Test::Small_Union& u1, Param_Test::Small_Union& u2, - Param_Test::Small_Union_out u3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Small_Union_out u3); virtual Param_Test::Recursive_Union* test_recursive_union (const Param_Test::Recursive_Union& ru1, Param_Test::Recursive_Union& ru2, - Param_Test::Recursive_Union_out ru3) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Recursive_Union_out ru3); virtual CORBA::Any* test_complex_any (const CORBA::Any &a1, CORBA::Any &a2, - CORBA::Any_out a3) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Any_out a3); // Test for multi dimensional arrays virtual Param_Test::Multdim_Array_slice * test_multdim_array (const Param_Test::Multdim_Array, Param_Test::Multdim_Array , - Param_Test::Multdim_Array_out) - ACE_THROW_SPEC ((CORBA::SystemException)); + Param_Test::Multdim_Array_out); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp index 0a472efebf6..e4bde8fc6d5 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp @@ -31,21 +31,18 @@ Echo_Client_Request_Interceptor (void) char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Echo_Client_Interceptor"); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ERROR((LM_ERROR, "ERROR, unexpected interception point called send_poll()\n")); @@ -55,8 +52,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { IOP::ServiceContext sc; sc.context_id = ::service_id; @@ -88,7 +83,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Check that the request service context can be retrieved. IOP::ServiceContext_var rc = @@ -109,8 +103,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Check that the request service context can be retrieved. IOP::ServiceContext_var rc = @@ -131,8 +123,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { Echo_Client_Request_Interceptor::exception_count++; } diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h index 2faafc7f5c5..c5b3adb42bf 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h @@ -25,30 +25,20 @@ public: static unsigned long other_count; static unsigned long exception_count; - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); }; #endif /* Client_Interceptor__h_ */ diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp index f06678f33a8..9e3115b5d4e 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp @@ -18,14 +18,12 @@ Client_ORBInitializer::Client_ORBInitializer () void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_var interceptor( new Echo_Client_Request_Interceptor); diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h index c0425f701fa..97fca542091 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.h @@ -20,11 +20,9 @@ class Client_ORBInitializer public: Client_ORBInitializer (); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp index 89e5f53ca1a..2f644181f4d 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp @@ -16,14 +16,12 @@ Echo::Echo(CORBA::ORB_ptr orb) char * Echo::echo_operation(char const * the_input) - ACE_THROW_SPEC((CORBA::SystemException)) { return CORBA::string_dup(the_input); } void Echo::shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)) { this->orb_->shutdown(0); } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h index 3fce554f5bd..9109ade0624 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h @@ -17,10 +17,8 @@ class Echo public: Echo(CORBA::ORB_ptr orb); - virtual char * echo_operation(char const * the_input) - ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual char * echo_operation(char const * the_input); + virtual void shutdown(void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp index 026b56bd3dc..61f218c4c0c 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp @@ -20,26 +20,22 @@ Echo_Handler::Echo_Handler(void) void Echo_Handler::echo_operation (char const *) - ACE_THROW_SPEC((CORBA::SystemException)) { ++this->replies_; } void Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC((CORBA::SystemException)) { } void Echo_Handler::shutdown (void) - ACE_THROW_SPEC((CORBA::SystemException)) { } void Echo_Handler::shutdown_excep (::Messaging::ExceptionHolder *) - ACE_THROW_SPEC((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h index e95865e1e9a..dab5df292dc 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h @@ -17,14 +17,10 @@ class Echo_Handler public: Echo_Handler(void); - virtual void echo_operation(char const * retval) - ACE_THROW_SPEC((CORBA::SystemException)); - virtual void echo_operation_excep(::Messaging::ExceptionHolder * h) - ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(void) - ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown_excep(::Messaging::ExceptionHolder * h) - ACE_THROW_SPEC((CORBA::SystemException)); + virtual void echo_operation(char const * retval); + virtual void echo_operation_excep(::Messaging::ExceptionHolder * h); + virtual void shutdown(void); + virtual void shutdown_excep(::Messaging::ExceptionHolder * h); CORBA::ULong replies (void) const; diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp index 1d2ff768d21..1d56f937708 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp @@ -23,22 +23,18 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Echo_Server_Interceptor"); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -63,30 +59,23 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h index 6d770bb6290..14bceffeff3 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h @@ -20,31 +20,20 @@ class Echo_Server_Request_Interceptor public: Echo_Server_Request_Interceptor (); - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); }; #endif /* Server_Interceptor__h_ */ diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp index f2d80031d8e..4fc70427165 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp @@ -20,14 +20,12 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_var interceptor( new Echo_Server_Request_Interceptor); diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h index e65fe5085ce..0fce0838184 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h @@ -20,11 +20,9 @@ class Server_ORBInitializer public: Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index b982a6ee210..d6c1ed13d55 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -17,14 +17,12 @@ Client_ORBInitializer::Client_ORBInitializer (int interceptor_type) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_ptr tmp = diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h index 1a0b10ba5cb..11348d09d9d 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Client_ORBInitializer (int interceptor_type); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: int interceptor_type_; diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp index 3b021b51eb8..47a9da3516c 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -19,14 +19,12 @@ Server_ORBInitializer::Server_ORBInitializer (int interceptor_type) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr tmp = diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h index 1907dcab0db..ec9035abf99 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Server_ORBInitializer (int interceptor_type); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: int interceptor_type_; diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index 93ed136976e..dc2eefb25f2 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -25,21 +25,18 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor () char * Vault_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Vault_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -47,8 +44,6 @@ Vault_Client_Request_Interceptor::send_poll ( void Vault_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -89,7 +84,6 @@ Vault_Client_Request_Interceptor::send_request ( void Vault_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -106,8 +100,6 @@ Vault_Client_Request_Interceptor::receive_reply ( void Vault_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -115,8 +107,6 @@ Vault_Client_Request_Interceptor::receive_other ( void Vault_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Any_var any = ri->received_exception (); @@ -149,21 +139,18 @@ Vault_Client_Request_Context_Interceptor::~Vault_Client_Request_Context_Intercep char * Vault_Client_Request_Context_Interceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Vault_Client_Request_Context_Interceptor::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_Context_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -171,8 +158,6 @@ Vault_Client_Request_Context_Interceptor::send_poll ( void Vault_Client_Request_Context_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // MAke the context to send the context to the target @@ -197,8 +182,6 @@ Vault_Client_Request_Context_Interceptor::send_request ( void Vault_Client_Request_Context_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -206,7 +189,6 @@ Vault_Client_Request_Context_Interceptor::receive_other ( void Vault_Client_Request_Context_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -214,8 +196,6 @@ Vault_Client_Request_Context_Interceptor::receive_reply ( void Vault_Client_Request_Context_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Any_var any = ri->received_exception (); @@ -248,21 +228,18 @@ Vault_Client_Request_Dynamic_Interceptor::~Vault_Client_Request_Dynamic_Intercep char * Vault_Client_Request_Dynamic_Interceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Vault_Client_Request_Dynamic_Interceptor::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_Dynamic_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -270,8 +247,6 @@ Vault_Client_Request_Dynamic_Interceptor::send_poll ( void Vault_Client_Request_Dynamic_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -304,7 +279,6 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( void Vault_Client_Request_Dynamic_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -331,8 +305,6 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( void Vault_Client_Request_Dynamic_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -340,8 +312,6 @@ Vault_Client_Request_Dynamic_Interceptor::receive_other ( void Vault_Client_Request_Dynamic_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Any_var any = ri->received_exception (); @@ -374,21 +344,18 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor () char * Vault_Client_Request_NOOP_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Vault_Client_Request_NOOP_Interceptor::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_NOOP_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -396,8 +363,6 @@ Vault_Client_Request_NOOP_Interceptor::send_poll ( void Vault_Client_Request_NOOP_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } @@ -405,8 +370,6 @@ Vault_Client_Request_NOOP_Interceptor::send_request ( void Vault_Client_Request_NOOP_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -414,7 +377,6 @@ Vault_Client_Request_NOOP_Interceptor::receive_other ( void Vault_Client_Request_NOOP_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -422,8 +384,6 @@ Vault_Client_Request_NOOP_Interceptor::receive_reply ( void Vault_Client_Request_NOOP_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Any_var any = ri->received_exception (); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h index bdc6760fe89..22a2a4626db 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h @@ -31,30 +31,20 @@ public: virtual ~Vault_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; @@ -71,30 +61,20 @@ public: virtual ~Vault_Client_Request_Context_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; @@ -111,30 +91,20 @@ public: virtual ~Vault_Client_Request_Dynamic_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; @@ -151,30 +121,20 @@ public: virtual ~Vault_Client_Request_NOOP_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index 8cc0f504334..9464721742f 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -25,22 +25,18 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor () char * Vault_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Vault_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -48,8 +44,6 @@ Vault_Server_Request_Interceptor::receive_request_service_contexts ( void Vault_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -84,7 +78,6 @@ Vault_Server_Request_Interceptor::receive_request ( void Vault_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -101,8 +94,6 @@ Vault_Server_Request_Interceptor::send_reply ( void Vault_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } @@ -110,8 +101,6 @@ Vault_Server_Request_Interceptor::send_exception ( void Vault_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } @@ -130,22 +119,18 @@ Vault_Server_Request_Context_Interceptor::~Vault_Server_Request_Context_Intercep char * Vault_Server_Request_Context_Interceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Vault_Server_Request_Context_Interceptor::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_Context_Interceptor::receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -153,8 +138,6 @@ Vault_Server_Request_Context_Interceptor::receive_request_service_contexts( void Vault_Server_Request_Context_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { IOP::ServiceId id = request_ctx_id; @@ -170,7 +153,6 @@ Vault_Server_Request_Context_Interceptor::receive_request ( void Vault_Server_Request_Context_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -178,16 +160,12 @@ Vault_Server_Request_Context_Interceptor::send_reply ( void Vault_Server_Request_Context_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Vault_Server_Request_Context_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } @@ -205,22 +183,18 @@ Vault_Server_Request_Dynamic_Interceptor::~Vault_Server_Request_Dynamic_Intercep char * Vault_Server_Request_Dynamic_Interceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Vault_Server_Request_Dynamic_Interceptor::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_Dynamic_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -253,8 +227,6 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( void Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -262,7 +234,6 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts( void Vault_Server_Request_Dynamic_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -287,16 +258,12 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( void Vault_Server_Request_Dynamic_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Vault_Server_Request_Dynamic_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } @@ -314,30 +281,24 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor () char * Vault_Server_Request_NOOP_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Vault_Server_Request_NOOP_Interceptor::destroy () - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_NOOP_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -345,7 +306,6 @@ Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts( void Vault_Server_Request_NOOP_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -353,16 +313,12 @@ Vault_Server_Request_NOOP_Interceptor::send_reply ( void Vault_Server_Request_NOOP_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Vault_Server_Request_NOOP_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h index 3d8481368d5..0ce1704f5b7 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h @@ -31,32 +31,21 @@ public: ~Vault_Server_Request_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); private: const char *myname_; @@ -73,32 +62,21 @@ public: ~Vault_Server_Request_Context_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); private: const char *myname_; @@ -115,32 +93,21 @@ public: ~Vault_Server_Request_Dynamic_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); private: const char *myname_; @@ -157,32 +124,21 @@ public: ~Vault_Server_Request_NOOP_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index bc2945f2fed..c4b676c7d06 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -14,15 +14,12 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb) CORBA::Short Secure_Vault_i::ready (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void Secure_Vault_i::authenticate (const char * user) - ACE_THROW_SPEC ((CORBA::SystemException, - Test_Interceptors::Invalid)) { if (ACE_OS::strcmp (user, "root") != 0) throw Test_Interceptors::Invalid (); @@ -32,14 +29,12 @@ Secure_Vault_i::authenticate (const char * user) CORBA::Long Secure_Vault_i::update_records (CORBA::Long, const Test_Interceptors::Secure_Vault::Record &) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void Secure_Vault_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index 9516f9babe1..f6e15213c34 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -27,20 +27,15 @@ public: Secure_Vault_i (CORBA::ORB_ptr orb); // ctor - virtual CORBA::Short ready (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short ready (void); - virtual void authenticate (const char * user) - ACE_THROW_SPEC ((CORBA::SystemException, - Test_Interceptors::Invalid)); + virtual void authenticate (const char * user); // Passwd sent in the service context list virtual CORBA::Long update_records (CORBA::Long id, - const Test_Interceptors::Secure_Vault::Record & val) - ACE_THROW_SPEC ((CORBA::SystemException)); + const Test_Interceptors::Secure_Vault::Record & val); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp index 81394e0fdbd..2a0776226f0 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp @@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h index c232ee05e1a..9850870f124 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp index 379d2a83186..b39d4b07273 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp @@ -16,14 +16,12 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Install the Echo server request interceptor ACE_NEW_THROW_EX (this->server_interceptor_, diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h index 6db28e5db35..f9994a93d7a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h @@ -32,11 +32,9 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp index 44121112bd8..f553d202517 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp @@ -30,21 +30,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -52,8 +49,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) { @@ -178,7 +173,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->orb_.in ())) @@ -244,8 +238,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) { @@ -288,8 +280,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h index 705bce07974..8e8ec520789 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h @@ -31,30 +31,20 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (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 receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp index f6e6374bcb4..5085db8c163 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp @@ -34,7 +34,6 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) void Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_location) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (forward_location)) throw CORBA::INV_OBJREF ( @@ -47,22 +46,18 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -125,8 +120,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -134,7 +127,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var operation = ri->operation (); @@ -181,8 +173,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -229,8 +219,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h index 064060a82ed..9e06f9fda85 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h @@ -33,35 +33,23 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - void forward_reference (CORBA::Object_ptr forward_location) - ACE_THROW_SPEC ((CORBA::SystemException)); + void forward_reference (CORBA::Object_ptr forward_location); - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp index 925f856c0b5..0d201962ba4 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp @@ -14,22 +14,18 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); } void Visual_i::nothing (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void Visual_i::user (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); @@ -37,7 +33,6 @@ Visual_i::user (void) void Visual_i::system (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); @@ -45,7 +40,6 @@ Visual_i::system (void) void Visual_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h index cda32b963d9..e1130b91bfb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h @@ -28,21 +28,15 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal (CORBA::Long arg); - void nothing (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void nothing (void); - void user (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Test_Interceptors::Silly)); + void user (void); - void system (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void system (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp index f34df67521f..ea422a7f284 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp @@ -16,7 +16,6 @@ Client_ORBInitializer::Client_ORBInitializer (void) : void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { pre_init_called = true; @@ -26,7 +25,6 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { post_init_called = true; diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h index 7a957b49449..73d1a7ed2f2 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); bool pre_init_called; bool post_init_called; diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp index 488e02da7a1..405d64c01a2 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp @@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::SlotId slot_id = info->allocate_slot_id (); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h index c232ee05e1a..9850870f124 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp index b3b7e6c0aff..7820c79abef 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp @@ -17,14 +17,12 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // allocate a slot slotId = info->allocate_slot_id (); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h index 6db28e5db35..f9994a93d7a 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h @@ -32,11 +32,9 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp index 1eeb8900fbf..146f0606559 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp @@ -25,21 +25,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -47,8 +44,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -75,7 +70,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var operation = ri->operation (); @@ -89,8 +83,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -102,8 +94,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h index 422b2b85d2b..a9345f46f15 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h @@ -31,30 +31,20 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (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 receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp index 3fab15a987f..cea1f8c5ee5 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -21,22 +21,18 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -94,8 +90,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -103,7 +97,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -111,8 +104,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -120,8 +111,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h index a557c28d97e..3e9c58d9b5f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h @@ -31,32 +31,21 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp index 66cf0bea079..840b4b04ffa 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -17,7 +17,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -58,7 +57,6 @@ Visual_i::normal (CORBA::Long arg) void Visual_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h index 335729c2d2c..bb17fef8a4b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h @@ -28,10 +28,8 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal (CORBA::Long arg); + void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp index 40b23b8c661..80338bf5bde 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp @@ -10,14 +10,12 @@ void Echo_Collocated_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Collocated_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h index 4865ea54fbe..b8eed4343a0 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.h @@ -29,11 +29,9 @@ class Echo_Collocated_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 6a3f8ba9884..9916316c78f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -27,14 +27,12 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -42,7 +40,6 @@ void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -50,8 +47,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { client_interceptor_check_++; @@ -90,8 +85,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { client_interceptor_check_++; @@ -108,7 +101,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { client_interceptor_check_++; @@ -160,8 +152,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { client_interceptor_check_++; @@ -191,30 +181,24 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++server_interceptor_check_; @@ -254,7 +238,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++server_interceptor_check_; @@ -304,8 +287,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++server_interceptor_check_; @@ -332,8 +313,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++server_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h index 2655dcf2fde..4456ffed47e 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h @@ -33,36 +33,24 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr); - 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_other ( PortableInterceptor::ClientRequestInfo_ptr - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); - 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)); + PortableInterceptor::ClientRequestInfo_ptr ri); // Some identifiers that are used for error checking static CORBA::ULong client_interceptor_check_; @@ -81,38 +69,23 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + PortableInterceptor::ServerRequestInfo_ptr); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - 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 - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); // Some identifiers that are used for error checking static CORBA::ULong server_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp index b95b285602e..85cddd874d7 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp @@ -13,7 +13,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); } @@ -21,7 +20,6 @@ Visual_i::normal (CORBA::Long) CORBA::Long Visual_i::calculate (CORBA::Long one, CORBA::Long two) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); return (one + two); @@ -29,7 +27,6 @@ Visual_i::calculate (CORBA::Long one, void Visual_i::user (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); throw Test_Interceptors::Silly (); @@ -37,7 +34,6 @@ Visual_i::user (void) void Visual_i::system (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); @@ -45,7 +41,6 @@ Visual_i::system (void) void Visual_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->_remove_ref (); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h index 841d3ef41df..2ccfe475b5f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h @@ -27,22 +27,17 @@ public: Visual_i (CORBA::ORB_ptr orb); // ctor - void normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal (CORBA::Long arg); CORBA::Long calculate ( CORBA::Long one, - CORBA::Long two) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long two); - void user (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); + void user (void); - void system (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void system (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp index be0762f3add..104386eca6c 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp @@ -11,14 +11,12 @@ Collocated_ORBInitializer::Collocated_ORBInitializer (void) void Collocated_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Collocated_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h index 94f2002627f..7a6ab89c320 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h @@ -28,11 +28,9 @@ public: /// Constructor Collocated_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp index a660fab5984..ccb493f659e 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp @@ -26,21 +26,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -48,8 +45,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) @@ -110,7 +105,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->orb_.in ())) @@ -181,8 +175,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_DEBUG ((LM_DEBUG, "%s.receive_other\n", @@ -192,8 +184,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) { @@ -270,22 +260,18 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -333,8 +319,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -342,7 +326,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var operation = ri->operation (); @@ -389,8 +372,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -437,8 +418,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h index 1f7697c2b2c..6a6dab8b53f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h @@ -30,30 +30,20 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; @@ -77,32 +67,21 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp index 1698c9deb89..a1a35158494 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp @@ -14,22 +14,18 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); } void Visual_i::nothing (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void Visual_i::user (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); @@ -37,7 +33,6 @@ Visual_i::user (void) void Visual_i::system (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); @@ -45,7 +40,6 @@ Visual_i::system (void) void Visual_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // this->_remove_ref (); ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n")); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h index 3462b7381bc..1f2972e09bf 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h @@ -26,21 +26,15 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal (CORBA::Long arg); - void nothing (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void nothing (void); - void user (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Test_Interceptors::Silly)); + void user (void); - void system (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void system (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index 8ac0bdf1e27..2235181a86d 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -13,14 +13,12 @@ ACE_RCSID (Dynamic, Echo_Client_ORBInitializer, "$Id$") void Echo_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ClientRequestInterceptor_ptr interceptor = diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h index ed54836594f..13f6cbe80f2 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h @@ -31,11 +31,9 @@ class Echo_Client_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index 6644b46f786..b701542cab6 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -13,14 +13,12 @@ ACE_RCSID (Dynamic, Echo_Server_ORBInitializer, "$Id$") void Echo_Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor = diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h index 260321c8c22..57f92f71138 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h @@ -31,11 +31,9 @@ class Echo_Server_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index 75d06c89160..c2e812592fd 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -25,14 +25,12 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,7 +38,6 @@ void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -48,8 +45,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -99,8 +94,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -114,7 +107,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -217,8 +209,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h index 4c46a2ca34e..98513716bc6 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h @@ -28,39 +28,25 @@ public: Echo_Client_Request_Interceptor (void); // ctor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr - ) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + ); - 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_other ( PortableInterceptor::ClientRequestInfo_ptr - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); - 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)); + PortableInterceptor::ClientRequestInfo_ptr ri); protected: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 07796958db9..370f3365f30 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -25,30 +25,24 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -84,7 +78,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -133,8 +126,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -160,8 +151,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h index c6965925c02..30727c56541 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h @@ -27,39 +27,24 @@ public: Echo_Server_Request_Interceptor (void); // cotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - 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 - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); protected: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index d13cfebd6c9..b0f36f70bc2 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -15,7 +15,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long arg, CORBA::String_out msg) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); msg = CORBA::string_dup ("DO_NOT_INSULT_MY_INTELLIGENCE"); @@ -24,7 +23,6 @@ Visual_i::normal (CORBA::Long arg, CORBA::Long Visual_i::calculate (CORBA::Long one, CORBA::Long two) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); return (one + two); @@ -32,7 +30,6 @@ Visual_i::calculate (CORBA::Long one, Test_Interceptors::Visual::VarLenStruct * Visual_i::the_structure (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Test_Interceptors::Visual::VarLenStruct * s; @@ -50,7 +47,6 @@ Visual_i::the_structure (void) void Visual_i::user (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); @@ -58,7 +54,6 @@ Visual_i::user (void) void Visual_i::system (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); @@ -66,7 +61,6 @@ Visual_i::system (void) void Visual_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h index 6999c24bd2b..fb6ffb675a8 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -22,24 +22,18 @@ public: Visual_i (CORBA::ORB_ptr orb); virtual CORBA::Long calculate (CORBA::Long one, - CORBA::Long two) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long two); void normal (CORBA::Long arg, - CORBA::String_out msg) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::String_out msg); - virtual Test_Interceptors::Visual::VarLenStruct * the_structure () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Test_Interceptors::Visual::VarLenStruct * the_structure (); - virtual void user (void) - ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); + virtual void user (void); - virtual void system (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void system (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index 3502e13a75d..e09717bbe6a 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -17,14 +17,12 @@ ACE_RCSID (ForwardRequest, void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h index 4ed3c09f374..de46c5ee758 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.h @@ -42,11 +42,9 @@ class Client_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp index c652aac506f..7d20dc97510 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -21,22 +21,18 @@ Client_Request_Interceptor::Client_Request_Interceptor ( char * Client_Request_Interceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Client_Request_Interceptor"); } void Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++this->request_count_; @@ -79,30 +75,24 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h index 5473606c20a..099f360b0a4 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h @@ -65,34 +65,24 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp index fefe4eb0c3d..f6503aca183 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp @@ -20,14 +20,12 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; // Install the server request interceptor. diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h index 289899370ec..c1cd4bd7166 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h @@ -48,11 +48,9 @@ public: /// Constructor. Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp index 6f113992989..214087641e5 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -25,7 +25,6 @@ void Server_Request_Interceptor::forward_references ( CORBA::Object_ptr obj1, CORBA::Object_ptr obj2) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2)) throw CORBA::INV_OBJREF ( @@ -40,14 +39,12 @@ Server_Request_Interceptor::forward_references ( char * Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::release (this->obj_[0]); CORBA::release (this->obj_[1]); @@ -56,8 +53,6 @@ Server_Request_Interceptor::destroy (void) void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { this->request_count_++; @@ -91,8 +86,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = ri->response_expected (); @@ -128,23 +121,18 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = ri->response_expected (); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h index 299f1a5bc62..cd53fad237d 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h @@ -65,8 +65,7 @@ public: /// Set the references to which requests will be forwarded. virtual void forward_references (CORBA::Object_ptr obj1, - CORBA::Object_ptr obj2) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Object_ptr obj2); /** * @name Methods Required by the Server Request Interceptor @@ -78,35 +77,24 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} protected: diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp index 283aae38b3c..b25a7d02ce9 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp @@ -19,14 +19,12 @@ test_i::~test_i (void) CORBA::Short test_i::number (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h index 8b1d8091b62..a642c43f546 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h @@ -37,12 +37,10 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short number (void); /// Shutdown the ORB. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index afe0aa159a9..a463219700c 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -18,22 +18,18 @@ FOO_ClientRequestInterceptor::FOO_ClientRequestInterceptor ( char * FOO_ClientRequestInterceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_ClientRequestInterceptor"); } void FOO_ClientRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_ClientRequestInterceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Verify that the tagged component that was supposed to be embedded // into the IOR by the FOO_IORInterceptor is actually in the IOR @@ -88,29 +84,23 @@ FOO_ClientRequestInterceptor::send_request ( void FOO_ClientRequestInterceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_ClientRequestInterceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_ClientRequestInterceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void FOO_ClientRequestInterceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h index 8af1cbf2dcb..a8e4f93dbfd 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -60,34 +60,24 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp index 733cbfe45b3..0200be0375c 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp @@ -13,14 +13,12 @@ void FOO_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::CodecFactory_var codec_factory = info->codec_factory (); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h index 4b69449d50b..fe42e85e5d2 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.h @@ -54,13 +54,11 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); //@} }; diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp index f776640a8e6..57fd9b42094 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp @@ -15,21 +15,18 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec) char * FOO_IORInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_IORInterceptor"); } void FOO_IORInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // According to the Portable Interceptors specification, // IORInterceptor::establish_components() must not throw an @@ -101,7 +98,6 @@ FOO_IORInterceptor::establish_components ( void FOO_IORInterceptor::components_established ( PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Construct a dummy tagged component. IOP::TaggedComponent component; @@ -160,7 +156,6 @@ void FOO_IORInterceptor::adapter_manager_state_changed ( const char *, PortableInterceptor::AdapterState) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -168,6 +163,5 @@ void FOO_IORInterceptor:: adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq &, PortableInterceptor::AdapterState) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index 2072514f20b..6a699c40792 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -59,35 +59,25 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Add the tagged components to the IOR. virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::IORInfo_ptr info); virtual void components_established ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::IORInfo_ptr info); virtual void adapter_manager_state_changed ( const char * id, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + PortableInterceptor::AdapterState state); virtual void adapter_state_changed ( const PortableInterceptor::ObjectReferenceTemplateSeq & templates, - PortableInterceptor::AdapterState state) - ACE_THROW_SPEC (( - CORBA::SystemException - )); + PortableInterceptor::AdapterState state); //@} diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp index b1c050af679..95d3c5babce 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp @@ -14,14 +14,12 @@ void FOO_IORInterceptor_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void FOO_IORInterceptor_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::CodecFactory_var codec_factory = info->codec_factory (); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h index 3904a3b239d..ce563c445fa 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.h @@ -54,13 +54,11 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); //@} }; diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index 1856b7702c3..058e6335a3d 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -13,7 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "\"test_i\" is shutting down.\n")); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index d21f3a0833f..2b0aa7217b5 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h @@ -34,8 +34,7 @@ public: test_i (CORBA::ORB_ptr orb); /// Shutdown the ORB. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp index 3809deb700b..2e52e0adeb6 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp @@ -20,14 +20,12 @@ Server_ORBInitializer::Server_ORBInitializer (bool & destroy_called) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; ACE_NEW_THROW_EX (interceptor, diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h index d4f62cd34eb..7aed2e7790a 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.h @@ -46,11 +46,9 @@ public: /// Constructor. Server_ORBInitializer (bool & destroy_called); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp index 431b7adbf59..a78dc678b9b 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp @@ -22,14 +22,12 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) char * Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->destroy_called_ = true; } @@ -37,8 +35,6 @@ Server_Request_Interceptor::destroy (void) void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Interceptor::destroy() should not have been called yet. ACE_ASSERT (this->destroy_called_ == false); @@ -47,8 +43,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Interceptor::destroy() should not have been called yet. @@ -58,7 +52,6 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Interceptor::destroy() should not have been called yet. ACE_ASSERT (this->destroy_called_ == false); @@ -67,8 +60,6 @@ Server_Request_Interceptor::send_reply ( void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Interceptor::destroy() should not have been called yet. ACE_ASSERT (this->destroy_called_ == false); @@ -77,8 +68,6 @@ Server_Request_Interceptor::send_exception ( void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Interceptor::destroy() should not have been called yet. ACE_ASSERT (this->destroy_called_ == false); diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h index df187106cb7..45b443ba47e 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h @@ -60,35 +60,24 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} protected: diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp index b1d46d1d3d7..ea019951879 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp @@ -17,14 +17,12 @@ test_i::~test_i (void) void test_i::hello (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Hello!\n")); } void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Shutting down ORB.\n")); diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h index f05d76ad2e1..d7a25506928 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h @@ -36,12 +36,10 @@ public: ~test_i (void); /// Say hello. - virtual void hello (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void hello (void); /// Shutdown the ORB. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp index dbccc32eb01..f07af1f187a 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp @@ -19,14 +19,12 @@ void ClientORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = info->resolve_initial_references ("PICurrent"); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h index 2dd48ca5938..249d15eacdd 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.h @@ -61,13 +61,11 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); //@} }; diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp index 822b84bd545..69042d4326f 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp @@ -21,22 +21,18 @@ ClientRequestInterceptor::ClientRequestInterceptor ( char * ClientRequestInterceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ClientRequestInterceptor"); } void ClientRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -111,29 +107,23 @@ ClientRequestInterceptor::send_request ( void ClientRequestInterceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ClientRequestInterceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h index dbae0fbfff3..60bb14ec5d1 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h @@ -60,34 +60,24 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp index 2dc2ce44b33..0dd2ae70fc0 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp @@ -18,22 +18,18 @@ ClientRequestInterceptor2::ClientRequestInterceptor2 ( char * ClientRequestInterceptor2::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ClientRequestInterceptor2"); } void ClientRequestInterceptor2::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor2::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -86,29 +82,23 @@ ClientRequestInterceptor2::send_request ( void ClientRequestInterceptor2::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor2::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ClientRequestInterceptor2::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ClientRequestInterceptor2::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h index f33802ab240..1789695af4b 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h @@ -56,34 +56,24 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index f5a3bb414e6..0de620070ef 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -16,14 +16,12 @@ void ServerORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var obj = info->resolve_initial_references ("PICurrent"); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h index 0f58ff3827b..f4ebd2a58c3 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.h @@ -62,13 +62,11 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); //@} }; diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index f4c58199740..0c5ac6f0ffc 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -21,22 +21,18 @@ ServerRequestInterceptor::ServerRequestInterceptor ( char * ServerRequestInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void ServerRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -75,8 +71,6 @@ ServerRequestInterceptor::receive_request_service_contexts ( void ServerRequestInterceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { try { @@ -124,7 +118,6 @@ ServerRequestInterceptor::receive_request ( void ServerRequestInterceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -210,15 +203,11 @@ ServerRequestInterceptor::send_reply ( void ServerRequestInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h index b328d594e77..f40512200c3 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h @@ -59,35 +59,24 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index 334832663a7..af3dcc1edfd 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -21,7 +21,6 @@ test_i::~test_i (void) void test_i::invoke_me (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Test method invoked.\n")); @@ -129,7 +128,6 @@ test_i::invoke_me (void) void test_i::invoke_you (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Nothing to be tested here. This method is here just so that we // have a different method @@ -137,7 +135,6 @@ test_i::invoke_you (void) void test_i::invoke_we (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Insert some data into the TSC PICurrent object. const char str[] = "We drink milk!"; @@ -170,7 +167,6 @@ test_i::invoke_we (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server is shutting down.\n")); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index 02c15fffba3..16183113c81 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -41,22 +41,18 @@ public: ~test_i (void); /// Main servant test method. - virtual void invoke_me (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke_me (void); /// No-op method used so that a client request interceptor will be /// invoked when invoking this method from the above invoke_me() /// method. Say that 10 times fast. :-) - virtual void invoke_you (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke_you (void); /// Test just a set slot - virtual void invoke_we (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void invoke_we (void); /// Shutdown the ORB. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp index 8d6ecaa29de..37e62f127da 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp @@ -19,14 +19,12 @@ IORInterceptor::~IORInterceptor (void) char * IORInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (""); } void IORInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (this->success_); } @@ -34,7 +32,6 @@ IORInterceptor::destroy (void) void IORInterceptor::establish_components ( PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h index 7699f7b0d33..eeede279715 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h @@ -58,17 +58,14 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); /// Add the tagged components to the IOR. virtual void establish_components ( - PortableInterceptor::IORInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::IORInfo_ptr info); //@} protected: diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp index f8838b1e9f4..6351d93f35a 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp @@ -2,6 +2,7 @@ #include "Policy.h" +#include "tao/SystemException.h" #include "ace/Log_Msg.h" ACE_RCSID (PolicyFactory, @@ -20,21 +21,18 @@ Policy::~Policy (void) CORBA::ULong Policy::value (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::PolicyType Policy::policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return Test::POLICY_TYPE; } CORBA::Policy_ptr Policy::copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Policy_ptr p; ACE_NEW_THROW_EX (p, @@ -46,6 +44,5 @@ Policy::copy (void) void Policy::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h index 2843358dcbd..fdebe1daa6f 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h @@ -36,17 +36,13 @@ public: Policy (CORBA::ULong val); /// Test method defined in test IDL. - virtual CORBA::ULong value (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::ULong value (void); - virtual CORBA::PolicyType policy_type (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::PolicyType policy_type (void); - virtual CORBA::Policy_ptr copy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Policy_ptr copy (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); protected: diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp index 4c487d1fe64..4e90c443045 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp @@ -11,8 +11,6 @@ ACE_RCSID (PolicyFactory, CORBA::Policy_ptr PolicyFactory::create_policy (CORBA::PolicyType type, const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)) { // Sanity check since this condition should be caught earlier by the // TAO_PolicyFactory_Registry. diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h index 0b6943c92e1..f18411deb62 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.h @@ -54,9 +54,7 @@ public: /// Construct a Test::Policy object as a test. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::PolicyError)); + const CORBA::Any & value); //@} diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp index e454a4f0ccf..c0ec2c8b751 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp @@ -19,14 +19,12 @@ void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr /* info */ ) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::PolicyFactory_ptr p; ACE_NEW_THROW_EX (p, diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h index 960e020d009..e9d65e82a56 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.h @@ -54,13 +54,11 @@ public: //@{ /// The pre-initialization hook. virtual void pre_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); /// The post-initialization hook. virtual void post_init ( - PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ORBInitInfo_ptr info); //@} }; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp index ff60616bcad..0eb892fe7f8 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp @@ -19,14 +19,12 @@ Echo_Collocated_ORBInitializer::Echo_Collocated_ORBInitializer ( void Echo_Collocated_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Collocated_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h index 20ccaf9ce43..0280f393533 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h @@ -35,11 +35,9 @@ public: (PortableInterceptor::ProcessingMode server_proc_mode, PortableInterceptor::ProcessingMode client_proc_mode); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp index 90b479eda64..3525ebbcd07 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp @@ -29,14 +29,12 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -44,7 +42,6 @@ void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -52,8 +49,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -91,8 +86,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -111,7 +104,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -164,8 +156,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -200,30 +190,24 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -268,7 +252,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var op = ri->operation (); @@ -323,8 +306,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -356,8 +337,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++server_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h index 26521b44c3c..ab7fc5e820a 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h @@ -32,36 +32,24 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr); - 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_other ( PortableInterceptor::ClientRequestInfo_ptr - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); - 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)); + PortableInterceptor::ClientRequestInfo_ptr ri); // Some identifiers that are used for error checking static CORBA::ULong client_interceptor_check_; @@ -80,38 +68,23 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + PortableInterceptor::ServerRequestInfo_ptr); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - 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 - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); // Some identifiers that are used for error checking static CORBA::ULong server_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp index 10d6a5c709b..547a8c5366c 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp @@ -13,7 +13,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); } @@ -21,7 +20,6 @@ Visual_i::normal (CORBA::Long) CORBA::Long Visual_i::calculate (CORBA::Long one, CORBA::Long two) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); return (one + two); @@ -29,7 +27,6 @@ Visual_i::calculate (CORBA::Long one, void Visual_i::user (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); throw Test_Interceptors::Silly (); @@ -37,7 +34,6 @@ Visual_i::user (void) void Visual_i::system (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); @@ -45,7 +41,6 @@ Visual_i::system (void) void Visual_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->_remove_ref (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h index 841d3ef41df..2ccfe475b5f 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h @@ -27,22 +27,17 @@ public: Visual_i (CORBA::ORB_ptr orb); // ctor - void normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal (CORBA::Long arg); CORBA::Long calculate ( CORBA::Long one, - CORBA::Long two) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long two); - void user (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); + void user (void); - void system (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void system (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp index 97154274ed7..6aca7e80aac 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp @@ -17,14 +17,12 @@ Echo_Client_ORBInitializer::Echo_Client_ORBInitializer ( void Echo_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // TAO-Specific way to get to the ORB Core (and thus, the ORB). TAO_ORBInitInfo_var tao_info = diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h index ad6ce6e6549..55004810ad0 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h @@ -35,11 +35,9 @@ public: Echo_Client_ORBInitializer (PortableInterceptor::ProcessingMode proc_mode); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp index be6737a8e45..dc9f9092a96 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp @@ -17,14 +17,12 @@ Echo_Server_ORBInitializer::Echo_Server_ORBInitializer ( void Echo_Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h index c0e4e83fda7..190fb9f8dd4 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h @@ -34,11 +34,9 @@ public: Echo_Server_ORBInitializer (PortableInterceptor::ProcessingMode proc_mode); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); private: diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp index 14b1bef3587..a0ce7f47f0d 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp @@ -26,14 +26,12 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -41,7 +39,6 @@ void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr ) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing } @@ -49,8 +46,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { client_interceptor_check_++; @@ -84,8 +79,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { client_interceptor_check_++; @@ -100,7 +93,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { client_interceptor_check_++; @@ -148,8 +140,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { client_interceptor_check_++; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h index 1f4d73fbdd2..d1b6b22f9f3 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h @@ -31,36 +31,24 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr); - 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_other ( PortableInterceptor::ClientRequestInfo_ptr - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); - 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)); + PortableInterceptor::ClientRequestInfo_ptr ri); // Some identifiers that are used for error checking static CORBA::ULong client_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp index 4ad894b3f41..d7266e7638d 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp @@ -26,30 +26,24 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++server_interceptor_check_; @@ -89,7 +83,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++server_interceptor_check_; @@ -139,8 +132,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var op = ri->operation (); @@ -174,8 +165,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++server_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h index 51b6ba53736..eef328e94dc 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h @@ -31,38 +31,23 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + PortableInterceptor::ServerRequestInfo_ptr); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - 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 - ) - ACE_THROW_SPEC (( - CORBA::SystemException, - PortableInterceptor::ForwardRequest - )); + ); // Some identifiers that are used for error checking static CORBA::ULong server_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp index 9b5c7b32e41..af6f50de15c 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp @@ -12,7 +12,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); } @@ -20,7 +19,6 @@ Visual_i::normal (CORBA::Long) CORBA::Long Visual_i::calculate (CORBA::Long one, CORBA::Long two) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); return (one + two); @@ -28,7 +26,6 @@ Visual_i::calculate (CORBA::Long one, void Visual_i::user (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); throw Test_Interceptors::Silly (); @@ -36,7 +33,6 @@ Visual_i::user (void) void Visual_i::system (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); @@ -44,7 +40,6 @@ Visual_i::system (void) void Visual_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->_remove_ref (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h index 841d3ef41df..2ccfe475b5f 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h @@ -27,22 +27,17 @@ public: Visual_i (CORBA::ORB_ptr orb); // ctor - void normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal (CORBA::Long arg); CORBA::Long calculate ( CORBA::Long one, - CORBA::Long two) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long two); - void user (void) - ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); + void user (void); - void system (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void system (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp index 4c9307fbfcb..09f9419c5d2 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp @@ -20,7 +20,6 @@ Client_ORBInitializer::Client_ORBInitializer (Client_ORBInitializer *second) : void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++pre_init_called; @@ -37,7 +36,6 @@ Client_ORBInitializer::pre_init ( void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { ++post_init_called; } diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h index 677200a461a..0dd990c22d3 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Client_ORBInitializer (Client_ORBInitializer *second); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); int pre_init_called; int post_init_called; diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp index 4cc398ba54a..f42b8ca4578 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp @@ -16,14 +16,12 @@ ACE_RCSID (Redirection, void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = info->orb_id (); diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h index 4b0c0c76dba..ef4db0dd418 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.h @@ -30,11 +30,9 @@ class Client_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp index 5ab71be7307..1f18a6c90ac 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp @@ -20,22 +20,18 @@ Client_Request_Interceptor::Client_Request_Interceptor ( char * Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Client_Request_Interceptor"); } void Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++this->request_count_; } @@ -43,22 +39,18 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) { @@ -78,7 +70,5 @@ Client_Request_Interceptor::receive_exception ( void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h index fc6786cc224..a7ff5181b50 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h @@ -44,34 +44,24 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp index 6484f63d591..da369749751 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp @@ -18,14 +18,12 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor; ACE_NEW_THROW_EX (interceptor, diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h index 4c9e39a2d38..dccc2ebc7b7 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h @@ -36,11 +36,9 @@ public: /// Constructor. Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp index 78622ae0627..3123772c7cb 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp @@ -20,22 +20,18 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) char * Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { this->request_count_++; } @@ -43,15 +39,12 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (crash_point == 1 && this->request_count_ == 2) ACE_OS::exit (1); } @@ -59,15 +52,11 @@ Server_Request_Interceptor::send_reply ( void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h index 2bb20759f75..52a5d2e5e39 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h @@ -42,35 +42,24 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} protected: diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp index e5a76646be9..189b2447c94 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp @@ -19,14 +19,12 @@ test_i::~test_i (void) CORBA::Short test_i::number (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h index 6a733639a65..066079a89c6 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h @@ -26,12 +26,10 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short number (void); /// Shutdown the ORB. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp index b9fc8aa89e3..1e3d3682b0c 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp @@ -19,7 +19,6 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr orbinitinfo) - ACE_THROW_SPEC ((CORBA::SystemException)) { POA_TestModule::test* test = 0; ACE_NEW (test, @@ -94,7 +93,6 @@ Server_ORBInitializer::pre_init ( void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h index d9c602a0dec..e01a6522b16 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h @@ -32,11 +32,9 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp index 047efb616ff..7409c0021dc 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp @@ -14,14 +14,12 @@ ACE_RCSID (Request_Interceptor_Flow, void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Create and register the test request interceptors. diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h index affe429a3c5..e2d4ca3e84f 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.h @@ -45,11 +45,9 @@ class Client_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp index c9404a9a380..81ac1416066 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp @@ -19,8 +19,6 @@ Client_Request_Interceptor::Client_Request_Interceptor (const char *name) void Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = this->client_side_test (ri); @@ -75,7 +73,6 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean client_side = @@ -94,7 +91,6 @@ Client_Request_Interceptor::send_poll ( void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean client_side = @@ -150,8 +146,6 @@ Client_Request_Interceptor::receive_reply ( void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = @@ -229,8 +223,6 @@ Client_Request_Interceptor::receive_exception ( void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean client_side = diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h index e9ca7b9d507..053753ee635 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.h @@ -60,27 +60,19 @@ public: */ //@{ virtual void send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void send_poll ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); virtual void receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ClientRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp index 5c715ff03e3..23821477ad5 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -15,14 +15,12 @@ Request_Interceptor::Request_Interceptor (const char *name) char * Request_Interceptor::name () - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.in ()); } void Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong s_count = diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h index 6f41abec934..4e7e687a4b3 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h @@ -58,11 +58,9 @@ public: */ //@{ /// Return the name of this Requestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); //@} protected: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp index d9f79479560..fdaedb584cc 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp @@ -12,14 +12,12 @@ ACE_RCSID (Request_Interceptor_Flow, void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Create and register the test request interceptors. diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h index f8819bb9bc3..7c3444f0d04 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.h @@ -45,11 +45,9 @@ class Server_ORBInitializer : { public: - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp index 44952a79f1d..df570c750a7 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp @@ -22,8 +22,6 @@ Server_Request_Interceptor::Server_Request_Interceptor (const char *name) void Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = @@ -67,8 +65,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( void Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = @@ -85,7 +81,6 @@ Server_Request_Interceptor::receive_request ( void Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Boolean server_side = @@ -141,8 +136,6 @@ Server_Request_Interceptor::send_reply ( void Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = @@ -220,8 +213,6 @@ Server_Request_Interceptor::send_exception ( void Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::Boolean server_side = diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h index ac5b56bff1e..66d1ff9443d 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.h @@ -60,28 +60,19 @@ public: */ //@{ virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} private: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp index 2a9f74f7eca..6eddcc6653c 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -13,9 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::client_test (Test::TestScenario scenario) - ACE_THROW_SPEC ((Test::X, - Test::UnknownScenario, - CORBA::SystemException)) { switch (scenario) { @@ -35,9 +32,6 @@ test_i::client_test (Test::TestScenario scenario) void test_i::server_test (Test::TestScenario scenario, CORBA::ULongSeq_out myseq) - ACE_THROW_SPEC ((Test::X, - Test::UnknownScenario, - CORBA::SystemException)) { myseq = new CORBA::ULongSeq; @@ -58,7 +52,6 @@ test_i::server_test (Test::TestScenario scenario, void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h index ad5b2be3b75..a1fd0e22782 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -33,21 +33,14 @@ public: test_i (CORBA::ORB_ptr orb); /// The client-side test operation. - virtual void client_test (Test::TestScenario scenario) - ACE_THROW_SPEC ((Test::X, - Test::UnknownScenario, - CORBA::SystemException)); + virtual void client_test (Test::TestScenario scenario); /// The server-side test operation. virtual void server_test (Test::TestScenario scenario, - CORBA::ULongSeq_out myseq) - ACE_THROW_SPEC ((Test::X, - Test::UnknownScenario, - CORBA::SystemException)); + CORBA::ULongSeq_out myseq); /// Shutdown the ORB. - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp index 81394e0fdbd..2a0776226f0 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h index c232ee05e1a..9850870f124 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp index 98962f028bc..03a51a1c2e0 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp @@ -15,14 +15,12 @@ Server_ORBInitializer::Server_ORBInitializer (void) void Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableInterceptor::ServerRequestInterceptor_ptr interceptor = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h index b43bcf07b7d..fdd057149c4 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Server_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp index e6318e00110..fb01ff29c4c 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp @@ -27,21 +27,18 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) char * Echo_Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -49,8 +46,6 @@ Echo_Client_Request_Interceptor::send_poll ( void Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) @@ -114,7 +109,6 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->orb_.in ())) @@ -180,8 +174,6 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ACE_DEBUG ((LM_DEBUG, "%s.receive_other\n", @@ -191,8 +183,6 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h index af32be9e149..e2a65a1f048 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h @@ -31,30 +31,20 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp index ef37b2b4ab4..9e927668033 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp @@ -25,22 +25,18 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) char * Echo_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Echo_Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -91,8 +87,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( void Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do nothing } @@ -100,7 +94,6 @@ Echo_Server_Request_Interceptor::receive_request ( void Echo_Server_Request_Interceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var operation = ri->operation (); @@ -150,8 +143,6 @@ Echo_Server_Request_Interceptor::send_reply ( void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = ri->operation (); @@ -203,8 +194,6 @@ Echo_Server_Request_Interceptor::send_exception ( void Echo_Server_Request_Interceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h index cc14ce6591b..18cad2930d6 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h @@ -31,32 +31,21 @@ public: ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr); - 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) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); private: const char *myname_; diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp index 925f856c0b5..0d201962ba4 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -14,22 +14,18 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) void Visual_i::normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); } void Visual_i::nothing (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void Visual_i::user (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); @@ -37,7 +33,6 @@ Visual_i::user (void) void Visual_i::system (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); @@ -45,7 +40,6 @@ Visual_i::system (void) void Visual_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h index cda32b963d9..e1130b91bfb 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h @@ -28,21 +28,15 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal (CORBA::Long arg); - void nothing (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void nothing (void); - void user (void) - ACE_THROW_SPEC ((CORBA::SystemException, - Test_Interceptors::Silly)); + void user (void); - void system (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void system (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index 1f58c4db4ae..750d6167c1e 100644 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp @@ -14,7 +14,6 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb) void LCD_Display_imp::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "The ORB has been shutdown, Close the windows to exit \n")); @@ -24,7 +23,6 @@ LCD_Display_imp::shutdown (void) void LCD_Display_imp::send_val (CORBA::Long val) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "The value from server is <%d> \n", val)); diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h index 1305ce328e4..f1d517adfa8 100644 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h @@ -36,11 +36,9 @@ public: // ctor - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); - void send_val (CORBA::Long val) - ACE_THROW_SPEC ((CORBA::SystemException)); + void send_val (CORBA::Long val); signals: void set_value (int val); diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index 69c5979a187..db7cba9a3b4 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -14,11 +14,9 @@ public: RTCORBA::PriorityBands &bands); void test_method (CORBA::Boolean client_propagated, - CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short priority); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -43,7 +41,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb, void Test_i::test_method (CORBA::Boolean client_propagated, CORBA::Short client_priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the upcall thread's priority. CORBA::Short server_priority = @@ -108,7 +105,6 @@ Test_i::test_method (CORBA::Boolean client_propagated, void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp index 5c4740ebcc8..86416ddadde 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp @@ -15,14 +15,12 @@ Client_ORBInitializer::Client_ORBInitializer (void) void Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h index c232ee05e1a..9850870f124 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h @@ -31,11 +31,9 @@ public: /// Constructor Client_ORBInitializer (void); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); }; #if defined(_MSC_VER) diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp index 5b6980c223a..725288bf2f1 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp @@ -21,21 +21,18 @@ Client_Request_Interceptor::~Client_Request_Interceptor (void) char * Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::send_poll ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Do Nothing } @@ -43,8 +40,6 @@ Client_Request_Interceptor::send_poll ( void Client_Request_Interceptor::send_request ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { // Do Nothing } @@ -52,7 +47,6 @@ Client_Request_Interceptor::send_request ( void Client_Request_Interceptor::receive_reply ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { try @@ -76,16 +70,12 @@ Client_Request_Interceptor::receive_reply ( void Client_Request_Interceptor::receive_other ( PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { if (CORBA::is_nil (this->orb_.in ())) diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h index 83872792775..e8fea450a25 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h @@ -32,30 +32,20 @@ public: virtual ~Client_Request_Interceptor (); // dtor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Canonical name of the interceptor. - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); - 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_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); private: const char *myname_; diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 776e81a67ee..0ebfe985c70 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -18,11 +18,9 @@ public: // ctor // = The Test methods. - void test_method (CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (CORBA::Short priority); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -36,7 +34,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method (CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Use RTCurrent to find out the CORBA priority of the current // thread. @@ -67,7 +64,6 @@ Test_i::test_method (CORBA::Short priority) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index ac4205917d3..b5e012a90cd 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -16,11 +16,9 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -34,7 +32,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method ( /**/) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Test method invoked on the sever\n")); @@ -42,7 +39,6 @@ Test_i::test_method ( /**/) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutting down \n")); diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index efbdd6407a8..813b5429d2d 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -35,11 +35,9 @@ public: PortableServer::POA_ptr poa, Tests &tests); - void start (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void start (void); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); PortableServer::POA_ptr _default_POA (void); @@ -208,7 +206,6 @@ test_i::invocation_priority (RTCORBA::Priority invocation_priority) void test_i::start (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "\n")); @@ -288,7 +285,6 @@ test_i::thread_info (const char *method_name) void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->thread_info ("test_i::method"); } diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp index b97834fd630..29999455f8a 100644 --- a/TAO/tests/RTCORBA/Diffserv/server.cpp +++ b/TAO/tests/RTCORBA/Diffserv/server.cpp @@ -15,11 +15,9 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - void test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -32,7 +30,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Test_i::test_method\n")); @@ -40,7 +37,6 @@ Test_i::test_method (void) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp index 231ed2d2f02..3fec3b5fbf6 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp @@ -21,7 +21,6 @@ CORBA::Long test_i::method (CORBA::Long client_id, CORBA::Long iteration, CORBA::Long_out thread_count) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. TAO_ORB_Core_TSS_Resources *tss = @@ -62,7 +61,6 @@ test_i::_default_POA (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h index dbceb65c9ab..f6fa6a9fbee 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h @@ -22,12 +22,10 @@ public: /// Test method. CORBA::Long method (CORBA::Long client_id, CORBA::Long iteration, - CORBA::Long_out thread_count) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long_out thread_count); /// Shutdown the server. - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); /// Our POA. PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index 61a9bcf13ba..c7d15760b70 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -17,11 +17,9 @@ public: // ctor // = The Test methods. - void test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -35,7 +33,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method (/* */) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server: test_method invoked.\n")); @@ -43,7 +40,6 @@ Test_i::test_method (/* */) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index c48b57143ca..9270eade5ab 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -15,11 +15,9 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); PortableServer::POA_ptr _default_POA (void); @@ -38,7 +36,6 @@ test_i::test_i (CORBA::ORB_ptr orb, void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::method\n")); @@ -46,7 +43,6 @@ test_i::method (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 7e9f7724cfc..f13ac81e89c 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -18,11 +18,9 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -36,14 +34,12 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method ( /* */) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_method invoked\n")); } void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index e11d09b1640..3802b89a475 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -13,11 +13,9 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); PortableServer::POA_ptr _default_POA (void); @@ -36,7 +34,6 @@ test_i::test_i (CORBA::ORB_ptr orb, void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::method\n")); @@ -44,7 +41,6 @@ test_i::method (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 6030be5d764..72919678638 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -16,14 +16,11 @@ public: CORBA::Short server_priority, CORBA::Short client_priority); - CORBA::Short method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short method (void); - void prioritized_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void prioritized_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); PortableServer::POA_ptr _default_POA (void); @@ -48,7 +45,6 @@ test_i::test_i (CORBA::ORB_ptr orb, CORBA::Short test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::method\n")); @@ -58,7 +54,6 @@ test_i::method (void) void test_i::prioritized_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent"); @@ -80,7 +75,6 @@ test_i::prioritized_method (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp index 3399bf97feb..c3af66871f5 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp @@ -43,7 +43,6 @@ test_i::test_i (CORBA::ORB_ptr orb, void test_i::method (CORBA::ULong work, const char * iteration) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. TAO_ORB_Core_TSS_Resources *tss = @@ -102,7 +101,6 @@ test_i::_default_POA (void) void test_i::initialize (CORBA::ULong total_iterations) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->total_iterations_ = total_iterations; } diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h index 986f17c75e4..a863fbd111e 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h @@ -22,13 +22,11 @@ public: RTCORBA::Priority high_priority); /// Initialize the server. - void initialize (CORBA::ULong total_iterations) - ACE_THROW_SPEC ((CORBA::SystemException)); + void initialize (CORBA::ULong total_iterations); /// Test method. void method (CORBA::ULong work, - const char *iteration) - ACE_THROW_SPEC ((CORBA::SystemException)); + const char *iteration); /// Our POA. PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index e0147880013..ed3ee580a26 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -16,11 +16,9 @@ public: // ctor // = The Test methods. - void test_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -34,7 +32,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method (/* */) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Server: test_method invoked.\n")); @@ -42,7 +39,6 @@ Test_i::test_method (/* */) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index abd328de089..e392cf5dc5b 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -30,11 +30,9 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); PortableServer::POA_ptr _default_POA (void); @@ -53,7 +51,6 @@ test_i::test_i (CORBA::ORB_ptr orb, void test_i::method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. TAO_ORB_Core_TSS_Resources *tss = @@ -78,7 +75,6 @@ test_i::method (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (debug) ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 396b8831717..c818a81b734 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -17,11 +17,9 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)); + void test_method (CORBA::Short priority); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -35,7 +33,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::test_method (CORBA::Short priority) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Use RTCurrent to find out the CORBA priority of the current // thread. @@ -66,7 +63,6 @@ Test_i::test_method (CORBA::Short priority) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 6c5e4408c5a..48a479d4d03 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -18,8 +18,7 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -33,7 +32,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Received request to shut down the ORB\n")); diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp index 4a7e623ef80..2bf77daed60 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp @@ -20,7 +20,6 @@ test_i::test_i (CORBA::ORB_ptr orb, CORBA::Long test_i::method (CORBA::Long client_id, CORBA::Long iteration) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Get the ORB_Core's TSS resources. TAO_ORB_Core_TSS_Resources *tss = @@ -56,7 +55,6 @@ test_i::_default_POA (void) void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h index 1bcbf6173cd..a7a7861ada4 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h @@ -21,12 +21,10 @@ public: /// Test method. CORBA::Long method (CORBA::Long client_id, - CORBA::Long iteration) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long iteration); /// Shutdown the server. - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); /// Our POA. PortableServer::POA_ptr _default_POA (void); diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h index d84ab87c1e1..4e0cbf8a9ae 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h +++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h @@ -20,8 +20,7 @@ public RTScheduling::ThreadAction public: Test_Thread_Action (void); - virtual void _cxx_do (CORBA::VoidData data) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void _cxx_do (CORBA::VoidData data); }; #endif /*Thread_Action_H*/ @@ -33,7 +32,6 @@ Test_Thread_Action::Test_Thread_Action (void) void Test_Thread_Action::_cxx_do (CORBA::VoidData data) - ACE_THROW_SPEC ((CORBA::SystemException)) { Data* tmp = (Data*) data; diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp index b6bf436b6fd..375217055ca 100644 --- a/TAO/tests/RTScheduling/Scheduler.cpp +++ b/TAO/tests/RTScheduling/Scheduler.cpp @@ -19,27 +19,23 @@ TAO_Scheduler::~TAO_Scheduler (void) CORBA::PolicyList* TAO_Scheduler::scheduling_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } void TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &) - ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyList* TAO_Scheduler::poa_policies (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } char * TAO_Scheduler::scheduling_discipline_name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -47,7 +43,6 @@ TAO_Scheduler::scheduling_discipline_name (void) RTScheduling::ResourceManager_ptr TAO_Scheduler::create_resource_manager (const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 0; } @@ -56,7 +51,6 @@ void TAO_Scheduler::set_scheduling_parameter (PortableServer::Servant &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -65,8 +59,6 @@ TAO_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType const char *, CORBA::Policy_ptr, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { } @@ -75,8 +67,6 @@ TAO_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdT const char *, CORBA::Policy_ptr, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { } @@ -85,15 +75,12 @@ TAO_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)) { } void TAO_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &, const char *) - ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -101,15 +88,12 @@ void TAO_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &, const char *, CORBA::Policy_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { IOP::ServiceContext* srv_con = new IOP::ServiceContext; srv_con->context_id = Client_Interceptor::SchedulingInfo; @@ -127,8 +111,6 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque CORBA::String_out /*name*/, CORBA::Policy_out /*sched_param*/, CORBA::Policy_out /*implicit_sched_param*/) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { IOP::ServiceContext_var serv_cxt; @@ -165,53 +147,40 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque void TAO_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void TAO_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void TAO_Scheduler::cancel (const RTScheduling::Current::IdType &) - ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h index 27bb8751f52..a3e06044221 100644 --- a/TAO/tests/RTScheduling/Scheduler.h +++ b/TAO/tests/RTScheduling/Scheduler.h @@ -15,97 +15,66 @@ public RTScheduling::Scheduler, ~TAO_Scheduler (void); - 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); 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); private: RTScheduling::Current_var current_; }; diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp index 85301c079f7..79544c0dce9 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp @@ -20,7 +20,6 @@ public: } virtual void one_way (const char * message) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "One-Way Message = %s\n", @@ -28,7 +27,6 @@ public: } virtual char * two_way (const char * message) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Two-Way Message = %s\n", @@ -43,7 +41,6 @@ public: } virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { orb_->shutdown (); } diff --git a/TAO/tests/RTScheduling/VoidData/test.h b/TAO/tests/RTScheduling/VoidData/test.h index c0331b431bf..36965973ece 100644 --- a/TAO/tests/RTScheduling/VoidData/test.h +++ b/TAO/tests/RTScheduling/VoidData/test.h @@ -6,7 +6,6 @@ class test_impl :public test { public: virtual void bar (CORBA::VoidData something) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp index a674abae643..a2e99ade4fc 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp @@ -13,14 +13,12 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb) void Oneway_Receiver::raise_no_permission (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { throw CORBA::NO_PERMISSION (); } void Oneway_Receiver::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { PortableServer::POA_var poa = this->_default_POA (); @@ -32,7 +30,6 @@ Oneway_Receiver::destroy (void) Test::Shutdown_Helper_ptr Oneway_Receiver::get_shutdown_helper (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Shutdown_Helper *shutdown_helper; ACE_NEW_THROW_EX (shutdown_helper, diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h index 0f7cadff68f..2b4a9a6518a 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h @@ -17,14 +17,11 @@ public: Oneway_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void raise_no_permission (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void raise_no_permission (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); - virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp index fe72789790a..d7168f8a5a5 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp @@ -12,7 +12,6 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb) void Shutdown_Helper::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h index 935bd5d96aa..44fb581fce5 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h @@ -17,8 +17,7 @@ public: Shutdown_Helper (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp index 2ca4fe3f756..2002a8e631a 100644 --- a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp +++ b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp @@ -12,7 +12,6 @@ One_Impl::One_Impl (CORBA::ORB_ptr orb) char * One_Impl::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("One_Impl there!"); } @@ -24,7 +23,6 @@ Two_Impl::Two_Impl (CORBA::ORB_ptr orb) char * Two_Impl::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("One_Impl there!"); } @@ -37,7 +35,6 @@ Three_Impl::Three_Impl (CORBA::ORB_ptr orb) char * Three_Impl::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Three_Impl there!"); } diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h index c514c184b73..23c41190da1 100644 --- a/TAO/tests/Servant_To_Reference_Test/Test_i.h +++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h @@ -16,8 +16,7 @@ public: One_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); private: /// Use an ORB reference to conver strings to objects and shutdown @@ -33,8 +32,7 @@ public: Two_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); private: /// Use an ORB reference to conver strings to objects and shutdown @@ -50,8 +48,7 @@ public: Three_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp index ac237e4501d..ab05f3a1171 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.cpp +++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp @@ -5,7 +5,6 @@ void test_i::send_stuff (const char* string) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - %s\n", string)); } diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h index 7bb9a6d777e..e3ac4b3cc1c 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.h +++ b/TAO/tests/Server_Connection_Purging/Test_i.h @@ -13,8 +13,7 @@ class test_i { public: // = The skeleton methods - virtual void send_stuff (const char* string) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_stuff (const char* string); private: }; diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp index b2392e6dea6..e6c157058ea 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.cpp +++ b/TAO/tests/Server_Leaks/Ping_Service.cpp @@ -12,13 +12,11 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb) void Ping_Service::ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Ping_Service::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h index cf83b5bc6d9..06ebbe49590 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.h +++ b/TAO/tests/Server_Leaks/Ping_Service.h @@ -17,11 +17,9 @@ public: Ping_Service (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void ping (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp index 379c52e6aa5..1769811f1c8 100644 --- a/TAO/tests/Server_Port_Zero/Hello.cpp +++ b/TAO/tests/Server_Port_Zero/Hello.cpp @@ -14,14 +14,12 @@ Hello::Hello (CORBA::ORB_ptr orb) char * Hello::get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Hello there!"); } void Hello::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h index 6131e1a3c88..f87205c3011 100644 --- a/TAO/tests/Server_Port_Zero/Hello.h +++ b/TAO/tests/Server_Port_Zero/Hello.h @@ -17,11 +17,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * get_string (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp index edf2618af87..0d1ad577560 100644 --- a/TAO/tests/Single_Read/test_i.cpp +++ b/TAO/tests/Single_Read/test_i.cpp @@ -13,7 +13,6 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::method (CORBA::ULong request_number, const test::data &) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("server: Iteration %d @ %T\n"), @@ -28,7 +27,6 @@ test_i::method (CORBA::ULong request_number, void test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shudown... ")); diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h index e55503154a7..a6de2d05838 100644 --- a/TAO/tests/Single_Read/test_i.h +++ b/TAO/tests/Single_Read/test_i.h @@ -29,11 +29,9 @@ public: // = The test interface methods. void method (CORBA::ULong request_number, - const test::data &) - ACE_THROW_SPEC ((CORBA::SystemException)); + const test::data &); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: /// The ORB. diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp index 4caca817ffd..b6accb28b45 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp @@ -28,7 +28,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) CORBA::Short Smart_Test_Proxy::box_prices (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->price_ == 0) { diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h index df80c6814f4..2ba06e0df97 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h @@ -16,8 +16,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short box_prices(void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Short box_prices(void); // "Smartify" the method call! private: diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index 183d5451e8f..4b33f9d0ff3 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -29,14 +29,11 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short box_prices (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Short box_prices (void); - CORBA::Long tickets (CORBA::Short number) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long tickets (CORBA::Short number); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -50,21 +47,18 @@ Test_i::Test_i (CORBA::ORB_ptr orb) CORBA::Short Test_i::box_prices (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 125; } CORBA::Long Test_i::tickets (CORBA::Short number) - ACE_THROW_SPEC ((CORBA::SystemException)) { return 125 * number; } void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp index 1aed52ccf2f..0200835d0a8 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp @@ -14,9 +14,6 @@ Top_i::~Top_i () char * Top_i::shape (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("a point."); } @@ -33,18 +30,12 @@ Left_i::~Left_i () char * Left_i::shape (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("the left line"); } char * Left_i::color (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("black"); } @@ -61,18 +52,12 @@ Right_i::~Right_i () char * Right_i::shape (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("the right line"); } char * Right_i::color (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("red"); // @@ -80,9 +65,6 @@ Right_i::color (void) CORBA::Long Right_i::width (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return 0; } @@ -99,36 +81,24 @@ Buttom_i::~Buttom_i () char * Buttom_i::shape (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("a diamond"); } char * Buttom_i::color (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("translucent"); } CORBA::Long Buttom_i::width (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return 100; } char * Buttom_i::name (void) - ACE_THROW_SPEC (( - CORBA::SystemException - )) { return CORBA::string_dup ("Jubilee"); } diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h index 6200a2ec1d3..9896ece35c6 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h @@ -17,8 +17,7 @@ public: ~Top_i (void); // Ctor and dtor. - virtual char* shape (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char* shape (void); // Return the shape of this object (interface.) }; @@ -29,12 +28,10 @@ public: ~Left_i (void); // Ctor, dtor. - virtual char * shape (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * shape (void); // Return the shape of this object (interface.) - virtual char * color (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * color (void); // Return the color of this object (interface.) }; @@ -45,16 +42,13 @@ public: ~Right_i (void); // Ctor, dtor. - virtual char * shape (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * shape (void); // Return the shape of this object (interface.) - virtual char * color (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * color (void); // Return the color of this object (interface.) - virtual CORBA::Long width (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long width (void); // Return the width of the stuff. }; @@ -65,20 +59,16 @@ public: ~Buttom_i (void); // Ctor, dtor. - virtual char * shape (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * shape (void); // Return the shape of this object (interface.) - virtual char * color (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * color (void); // Return the color of this object (interface.) - virtual CORBA::Long width (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long width (void); // Return the width of the stuff. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); // Return the name of the object. }; diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp index e7124f4340f..65bb3c88526 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp @@ -30,9 +30,6 @@ Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy) char * Smart_Diamond_Top_Proxy::shape () - ACE_THROW_SPEC (( - CORBA::SystemException - )) { ACE_DEBUG ((LM_DEBUG, "Smart_proxy: This is ")); diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h index 1ad82aba624..6e4d005d9e5 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h @@ -25,10 +25,7 @@ class MY_Stub_Export Smart_Diamond_Top_Proxy : public virtual Diamond::TAO_Diamo Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy); virtual char * shape () - - ACE_THROW_SPEC (( - CORBA::SystemException - )); +; // Smartify the method call! // Dont need to add any extra functionality into shutdown() diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp index 0e5e1502cbb..245458f38a4 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.cpp @@ -8,8 +8,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) CORBA::Short Smart_Test_Proxy::method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)) { ACE_DEBUG ((LM_DEBUG, "Yahoo, I am smart\n")); diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h index e8207d93640..289adfea298 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Proxy_Impl.h @@ -7,9 +7,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)); + virtual CORBA::Short method (CORBA::Short boo); // "Smartify" the method call! // Don't need to add any extra functionality into <shutdown>, hence diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index 919ef94751d..5e83ca06fb9 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -29,12 +29,9 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)); + CORBA::Short method (CORBA::Short boo); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -48,8 +45,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) CORBA::Short Test_i :: method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test_i::method () invoked\n"))); @@ -61,7 +56,6 @@ Test_i :: method (CORBA::Short boo) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (); } diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp index fe230c1a052..b71652cae3a 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp @@ -29,8 +29,6 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) CORBA::Short Smart_Test_Proxy::method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)) { ACE_DEBUG ((LM_DEBUG, "Yahoo, I am smart\n")); diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h index 73515c2109e..ba291b7d2b4 100644 --- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.h @@ -17,9 +17,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)); + virtual CORBA::Short method (CORBA::Short boo); // "Smartify" the method call! // Don't need to add any extra functionality into <shutdown>, hence diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 3246d5a2919..3f1b759f5a6 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -29,12 +29,9 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)); + CORBA::Short method (CORBA::Short boo); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -48,8 +45,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) CORBA::Short Test_i :: method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test_i::method () invoked\n"))); @@ -61,7 +56,6 @@ Test_i :: method (CORBA::Short boo) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index bb3bf989309..36e3158ea0f 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -46,8 +46,6 @@ Smart_Test_Proxy::convert_to_ior (bool, CORBA::Short Smart_Test_Proxy::method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)) { ACE_DEBUG ((LM_DEBUG, "Yahoo, I am smart\n")); diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h index f31fe5eecff..ed7537777ce 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h @@ -23,9 +23,7 @@ public: virtual char* convert_to_ior (bool use_omg_ior_format, const char* ior_prefix) const; - virtual CORBA::Short method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)); + virtual CORBA::Short method (CORBA::Short boo); // "Smartify" the method call! static const ACE_CString& fake_ior (void); diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index 85bb22271ad..70db5fdd604 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -9,11 +9,9 @@ class Test_i: public virtual POA_Test public: Test_i (CORBA::ORB_ptr orb); - void hello (CORBA::Long howmany) - ACE_THROW_SPEC ((CORBA::SystemException)); + void hello (CORBA::Long howmany); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -26,14 +24,12 @@ Test_i::Test_i (CORBA::ORB_ptr orb) void Test_i::hello (CORBA::Long howmany) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "hello called with : %i \n", howmany)); } void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index 44fe62a987c..5c0fadca6dc 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -29,12 +29,9 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)); + CORBA::Short method (CORBA::Short boo); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; @@ -48,8 +45,6 @@ Test_i::Test_i (CORBA::ORB_ptr orb) CORBA::Short Test_i :: method (CORBA::Short boo) - ACE_THROW_SPEC ((CORBA::SystemException, - Test::Oops)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Test_i::method () invoked\n"))); @@ -61,7 +56,6 @@ Test_i :: method (CORBA::Short boo) void Test_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp index 1cbbf0bc8ea..f9e47df0972 100644 --- a/TAO/tests/Stack_Recursion/Sender.cpp +++ b/TAO/tests/Stack_Recursion/Sender.cpp @@ -35,7 +35,6 @@ Sender::is_done (void) const CORBA::Boolean Sender::get_data (CORBA::ULong size, Test::Payload_out payload) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, @@ -53,7 +52,6 @@ Sender::get_data (CORBA::ULong size, CORBA::Long Sender::get_event_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, @@ -65,14 +63,12 @@ Sender::get_event_count (void) void Sender::ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return; } void Sender::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->is_done_ == false) { diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h index 3acc8583883..8e66804cd41 100644 --- a/TAO/tests/Stack_Recursion/Sender.h +++ b/TAO/tests/Stack_Recursion/Sender.h @@ -27,17 +27,13 @@ public: // = The skeleton methods virtual CORBA::Boolean get_data (CORBA::ULong size, - Test::Payload_out payload) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::Payload_out payload); - virtual CORBA::Long get_event_count (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CORBA::Long get_event_count (void); - virtual void ping (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void ping (void); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: ACE_SYNCH_MUTEX mutex_; diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp index aa869165adf..fc61c63ee2d 100644 --- a/TAO/tests/Strategies/simple_test_i.cpp +++ b/TAO/tests/Strategies/simple_test_i.cpp @@ -11,7 +11,6 @@ ACE_RCSID(tests, simple_test_i, "$Id$") CORBA::Boolean Simple_Server_i::print_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -21,7 +20,6 @@ Simple_Server_i::print_status (void) void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h index bb4e73a24e3..c2680214a24 100644 --- a/TAO/tests/Strategies/simple_test_i.h +++ b/TAO/tests/Strategies/simple_test_i.h @@ -31,11 +31,9 @@ public: // ctor // = The Simple_Server methods. - CORBA::Boolean print_status (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Boolean print_status (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp index cc2786bbc7f..a28d4fc0aee 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp @@ -17,7 +17,6 @@ test_i::method (CORBA::ULong request_number, CORBA::Long start_time, const test::data &, CORBA::ULong work) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value start (0); start.msec (start_time); @@ -35,14 +34,12 @@ test_i::method (CORBA::ULong request_number, void test_i::flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "server: got flush request\n")); } void test_i::shutdown (CORBA::Long start_time) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value start (0); start.msec (start_time); diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h index a08938cf539..6a8e13412fe 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.h +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h @@ -32,14 +32,11 @@ public: void method (CORBA::ULong request_number, CORBA::Long start_time, const test::data &, - CORBA::ULong work) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::ULong work); - void flush (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void flush (void); - void shutdown (CORBA::Long start_time) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (CORBA::Long start_time); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc index e42705f179e..3cba6c3a497 100644 --- a/TAO/tests/Timeout/Timeout.mpc +++ b/TAO/tests/Timeout/Timeout.mpc @@ -21,7 +21,7 @@ project(*Server): taoserver { } project(*Client): taoclient, messaging { - after += *Server + after += *idl Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp index c4da7f0887c..e75b0e611ce 100644 --- a/TAO/tests/Timeout/test_i.cpp +++ b/TAO/tests/Timeout/test_i.cpp @@ -18,7 +18,6 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) CORBA::Long Simple_Server_i::echo (CORBA::Long x, CORBA::Long msecs) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_Time_Value tv (msecs / 1000, (msecs % 1000) * 1000); @@ -39,7 +38,6 @@ Simple_Server_i::echo (CORBA::Long x, void Simple_Server_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h index 8a135bdd767..8c102e3a1b7 100644 --- a/TAO/tests/Timeout/test_i.h +++ b/TAO/tests/Timeout/test_i.h @@ -32,10 +32,8 @@ public: // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, - CORBA::Long msecs) - ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long msecs); + void shutdown (void); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp index d2b11d0485c..b0cdb5507ea 100644 --- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp @@ -23,14 +23,12 @@ Current_Test_Impl::~Current_Test_Impl (void) ::CORBA::Long Current_Test_Impl::self_test (void) - ACE_THROW_SPEC ((::CORBA::SystemException)) { return 0; } void Current_Test_Impl::test_transport_current (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -72,7 +70,6 @@ Current_Test_Impl::test_transport_current (void) void Current_Test_Impl::invoked_by_client (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -92,7 +89,6 @@ Current_Test_Impl::invoked_by_client (void) void Current_Test_Impl::invoked_by_client_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext)) { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -128,7 +124,6 @@ Current_Test_Impl::invoked_by_client_i (void) void Current_Test_Impl::invoked_during_upcall (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -140,7 +135,6 @@ Current_Test_Impl::invoked_during_upcall (void) void Current_Test_Impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp index abaa7635727..1bc137d006e 100644 --- a/TAO/tests/TransportCurrent/Framework/Tester.cpp +++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp @@ -1,6 +1,7 @@ // $Id$ #include "tao/TransportCurrent/Transport_Current.h" +#include "tao/SystemException.h" using namespace TAO; @@ -10,8 +11,6 @@ using namespace TAO; int test_transport_current (Transport::Current_ptr tc) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)) { CORBA::Long id = tc->id (); @@ -36,8 +35,6 @@ test_transport_current (Transport::Current_ptr tc) int test_transport_current (CORBA::ORB_ptr orb) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)) { // Get the Current object. CORBA::Object_var tcobject = diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index bb9e52f8542..c113ed14627 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -25,14 +25,12 @@ Current_Test_Impl::~Current_Test_Impl (void) ::CORBA::Long Current_Test_Impl::self_test (void) - ACE_THROW_SPEC ((::CORBA::SystemException)) { return 0; } void Current_Test_Impl::test_transport_current (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -69,7 +67,6 @@ Current_Test_Impl::test_transport_current (void) void Current_Test_Impl::invoked_by_client (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level >= 1) { ACE_DEBUG ((LM_DEBUG, @@ -106,7 +103,6 @@ Current_Test_Impl::invoked_by_client (void) void Current_Test_Impl::invoked_during_upcall (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -117,7 +113,6 @@ Current_Test_Impl::invoked_during_upcall (void) void Current_Test_Impl::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index 27819ca3900..4c8074d7910 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -27,7 +27,6 @@ namespace Test { char * IIOP_Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("II SRI"); } @@ -35,7 +34,6 @@ namespace Test { /// TAO::Transport::IIOP::Current_ptr IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name (this->name ()); @@ -54,7 +52,6 @@ namespace Test { /// as index in an array, where we store the endpoint void IIOP_Server_Request_Interceptor::push_request_info (size_t requestID) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name (this->name ()); @@ -169,7 +166,6 @@ namespace Test { void IIOP_Server_Request_Interceptor::inbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name (this->name ()); CORBA::String_var op (ri->operation()); @@ -208,7 +204,6 @@ namespace Test { void IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag; @@ -228,8 +223,6 @@ namespace Test { void IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { try { @@ -251,7 +244,6 @@ namespace Test { void IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)) { try { @@ -273,8 +265,6 @@ namespace Test { void IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { try { @@ -297,8 +287,6 @@ namespace Test { void IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { try { diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h index d87ec6b1f5d..76f300cf32c 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h @@ -55,50 +55,38 @@ namespace Test */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); /// incomming interception point - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr); /// outgoing interception point - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); /// outgoing interception point - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); /// outgoing interception point - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); //@} protected: /// process incomming requests context void inbound_process_context - (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + (PortableInterceptor::ServerRequestInfo_ptr ri); /// process outgoing requests context void outbound_process_context - (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + (PortableInterceptor::ServerRequestInfo_ptr ri); /// saves the incomming request info - void push_request_info (size_t requestID) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push_request_info (size_t requestID); /// clears the outgoing request info void pop_request_info (size_t requestID); - TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid) - ACE_THROW_SPEC ((CORBA::SystemException)); + TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid); private: diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp index 6544b23169b..ba3162f9b58 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp @@ -3,6 +3,7 @@ // $Id$ #include "tao/TransportCurrent/IIOP_Transport_Current.h" +#include "tao/SystemException.h" #if defined (TAO_AS_STATIC_LIBS) #include "tao/TransportCurrent/IIOP_Current_Loader.h" @@ -14,7 +15,6 @@ ACE_STATIC_SVC_REQUIRE (TAO_Transport_Current_Loader) ACE_STATIC_SVC_REQUIRE (TAO_Transport_IIOP_Current_Loader) #endif /* TAO_AS_STATIC_LIBS */ - using namespace TAO; @@ -23,14 +23,11 @@ using namespace TAO; int test_transport_current (CORBA::ORB_ptr orb) - ACE_THROW_SPEC ((CORBA::SystemException, - CORBA::UserException)) { // Get the Current object. CORBA::Object_var tcobject = orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current")); - if (TAO_debug_level >= 1) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Tester (%P|%t) Resolved initial reference for IIOP::Current\n"))); diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp index c829c3919a4..c2bf2000119 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp @@ -27,14 +27,12 @@ namespace Test void Client_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)) { /* no-op */ } // A specialization to handle client-side interceptors void Client_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii) - ACE_THROW_SPEC ((CORBA::SystemException)) { oii->add_client_request_interceptor (this->interceptor_.in ()); } diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h index b95ef80777b..7c5eb831aab 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h @@ -36,11 +36,9 @@ namespace Test Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor); virtual ~Client_ORBInitializer (void); - virtual void pre_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init(PortableInterceptor::ORBInitInfo*); - virtual void post_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init(PortableInterceptor::ORBInitInfo*); private: PortableInterceptor::ClientRequestInterceptor_var interceptor_; diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp index 416f20365b5..5a84ba9b191 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp @@ -30,14 +30,12 @@ namespace Test char * Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Client_Request_Interceptor"); } void Client_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod) - ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("CRI (%P|%t) Test accessing Transport Current from %s\n"), @@ -61,13 +59,11 @@ namespace Test void Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { //Test TC test_transport_current ("send_request"); @@ -106,28 +102,24 @@ namespace Test void Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { test_transport_current ("send_poll"); } void Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { test_transport_current ("receive_reply"); } void Client_Request_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("receive_exception"); } void Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("receive_other"); } diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h index 97b726a1fd2..a4e2a7999bc 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h @@ -72,21 +72,16 @@ namespace Test virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - 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)); + 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); //@} // Number of interceptions @@ -95,8 +90,7 @@ namespace Test private: // Implementation method, every inteception point will have to // call it, supplying a name. - void test_transport_current (const ACE_TCHAR* amethod) - ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)); + void test_transport_current (const ACE_TCHAR* amethod); private: ///The ID of the ORB this interceptor is registered with. diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h index 2e0a1a8a1bc..af5670ca526 100644 --- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h +++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h @@ -42,8 +42,7 @@ public: /// No-op method used so that a client request interceptor will be /// invoked when invoking this method from the above invoke_me() /// method. Say that 10 times fast. :-) - virtual void invoked_during_upcall (void) - ACE_THROW_SPEC ((::CORBA::SystemException)); + virtual void invoked_during_upcall (void); /// Shutdown the ORB. virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -60,8 +59,7 @@ private: void test_transport_current (void) ACE_THROW_SPEC ((::CORBA::SystemException)); /// Main servant test method. - void invoked_by_client_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext)); + void invoked_by_client_i (void); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp index e7c4551b6ab..8e866e97052 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp @@ -27,14 +27,12 @@ namespace Test void Server_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)) { /* no-op */ } // A specialization to handle client-side interceptors void Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii) - ACE_THROW_SPEC ((CORBA::SystemException)) { oii->add_server_request_interceptor (this->interceptor_.in ()); } diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h index a39ca925359..e9d517c30bd 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h @@ -35,11 +35,9 @@ namespace Test Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor); virtual ~Server_ORBInitializer (void); - virtual void pre_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init(PortableInterceptor::ORBInitInfo*); - virtual void post_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init(PortableInterceptor::ORBInitInfo*); private: PortableInterceptor::ServerRequestInterceptor_var interceptor_; diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp index 024c0f6fe77..c0e7d2c218a 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp @@ -25,7 +25,6 @@ namespace Test void Server_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name (this->name ()); ACE_DEBUG ((LM_DEBUG, @@ -71,48 +70,41 @@ namespace Test char * Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("SRI "); } void Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("receive_request_service_contexts"); } void Server_Request_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("receive_request"); } void Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { test_transport_current ("send_reply"); } void Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("send_exception"); } void Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("send_other"); } diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h index b34c1ec6a4e..7776b86354a 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h @@ -57,8 +57,7 @@ namespace Test /// Destructor. virtual ~Server_Request_Interceptor (void); - virtual void test_transport_current (const char* amethod) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void test_transport_current (const char* amethod); /// Coherency test virtual bool self_test (void); @@ -77,20 +76,15 @@ namespace Test virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - 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); //@} protected: diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp index 83b7b630015..ffe3470c864 100644 --- a/TAO/tests/Two_Objects/First_i.cpp +++ b/TAO/tests/Two_Objects/First_i.cpp @@ -19,7 +19,6 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done) void First_i::oneway_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n")); diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h index 9c0b161be6a..618fcf042be 100644 --- a/TAO/tests/Two_Objects/First_i.h +++ b/TAO/tests/Two_Objects/First_i.h @@ -22,8 +22,7 @@ public: First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done); /// Interface methods.. - void oneway_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void oneway_method (void); private: diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp index 3f134825124..06baee28d6e 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.cpp +++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp @@ -19,7 +19,6 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len) //factory method to create first object Two_Objects_Test::First_ptr Object_Factory_i::create_first (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { First_i *first_impl; @@ -37,7 +36,6 @@ Object_Factory_i::create_first (void) //factory method to create second object Two_Objects_Test::Second_ptr Object_Factory_i::create_second (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Second_i *second_impl; diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h index f9d09a6c974..6599e00f80f 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.h +++ b/TAO/tests/Two_Objects/Object_Factory_i.h @@ -21,11 +21,9 @@ public: Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len); - Two_Objects_Test::First_ptr create_first (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Two_Objects_Test::First_ptr create_first (void); - Two_Objects_Test::Second_ptr create_second (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + Two_Objects_Test::Second_ptr create_second (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp index 828e9b67d22..f7814901d3d 100644 --- a/TAO/tests/Two_Objects/Second_i.cpp +++ b/TAO/tests/Two_Objects/Second_i.cpp @@ -24,7 +24,6 @@ Second_i::Second_i (CORBA::ORB_ptr orb, Two_Objects_Test::Octet_Seq * Second_i::twoway_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Two_Objects_Test::Octet_Seq *preply_mesg; @@ -56,7 +55,6 @@ Second_i::twoway_method (void) void Second_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n")); this->orb_->shutdown (0); diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h index be08514e3e9..214b9be1ece 100644 --- a/TAO/tests/Two_Objects/Second_i.h +++ b/TAO/tests/Two_Objects/Second_i.h @@ -21,11 +21,9 @@ public: CORBA::ULong len, ACE_Auto_Event &two_way_done); Two_Objects_Test::Octet_Seq * - twoway_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + twoway_method (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/tests/Typedef_String_Array/testImpl.cpp b/TAO/tests/Typedef_String_Array/testImpl.cpp index 11f65c2a3be..3e6e52cb7aa 100644 --- a/TAO/tests/Typedef_String_Array/testImpl.cpp +++ b/TAO/tests/Typedef_String_Array/testImpl.cpp @@ -28,7 +28,6 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb) void TestImpl::get_strings (ArrayOfString_out strings) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW (strings, ArrayOfString); diff --git a/TAO/tests/Typedef_String_Array/testImpl.h b/TAO/tests/Typedef_String_Array/testImpl.h index be1e7cb1c69..acbd61ef1cc 100644 --- a/TAO/tests/Typedef_String_Array/testImpl.h +++ b/TAO/tests/Typedef_String_Array/testImpl.h @@ -7,8 +7,7 @@ class TestImpl: public POA_SimpleStrings public: TestImpl(CORBA::ORB_ptr orb); - virtual void get_strings (ArrayOfString_out strings) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void get_strings (ArrayOfString_out strings); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc index 875eebbdd8f..86d7e71517d 100644 --- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc +++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc @@ -23,7 +23,6 @@ project(*Server): taoserver { project(*Client): taoclient, anytypecode { after += *idl - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 9ac86d826a5..5e7a8cc56be 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -23,14 +23,11 @@ public: test_i (CORBA::ORB_ptr orb); - void normal_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void normal_method (void); - void unknown_exception_in_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void unknown_exception_in_method (void); - void unknown_exception_during_deactivation (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void unknown_exception_during_deactivation (void); void _add_ref (void); void _remove_ref (void); @@ -48,7 +45,6 @@ test_i::test_i (CORBA::ORB_ptr orb) void test_i::normal_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::normal_method() called\n")); @@ -56,7 +52,6 @@ test_i::normal_method (void) void test_i::unknown_exception_in_method (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::unknown_exception_in_method() called\n")); @@ -69,7 +64,6 @@ test_i::unknown_exception_in_method (void) void test_i::unknown_exception_during_deactivation (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "test_i::unknown_exception_during_deactivation() called\n")); @@ -116,11 +110,9 @@ public: test_factory_i (CORBA::ORB_ptr orb); - test_ptr create_test (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + test_ptr create_test (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); CORBA::ORB_var orb_; }; @@ -132,7 +124,6 @@ test_factory_i::test_factory_i (CORBA::ORB_ptr orb) test_ptr test_factory_i::create_test (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { test_i *servant = new test_i (this->orb_.in ()); @@ -148,7 +139,6 @@ test_factory_i::create_test (void) void test_factory_i::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "factory_i::shutdown() called\n")); diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp index 60e7c2775e1..3523135d7e3 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.cpp +++ b/TAO/tests/Xt_Stopwatch/test_i.cpp @@ -12,21 +12,18 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer) void Stopwatch_imp::start (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->timer_->start (); } void Stopwatch_imp::stop (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->timer_->stop (); } void Stopwatch_imp::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h index ba92631590d..539a82b16e0 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.h +++ b/TAO/tests/Xt_Stopwatch/test_i.h @@ -33,14 +33,11 @@ public: // ctor // = The Simple_Server methods. - void start (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void start (void); - void stop (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void stop (void); - void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + void shutdown (void); private: CORBA::ORB_var orb_; |