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/Portable_Interceptors | |
| 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/Portable_Interceptors')
164 files changed, 400 insertions, 1503 deletions
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: |