diff options
Diffstat (limited to 'TAO/tests/TransportCurrent/lib')
9 files changed, 18 insertions, 56 deletions
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp index c829c3919a4..c2bf2000119 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp @@ -27,14 +27,12 @@ namespace Test void Client_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)) { /* no-op */ } // A specialization to handle client-side interceptors void Client_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii) - ACE_THROW_SPEC ((CORBA::SystemException)) { oii->add_client_request_interceptor (this->interceptor_.in ()); } diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h index b95ef80777b..7c5eb831aab 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h @@ -36,11 +36,9 @@ namespace Test Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor); virtual ~Client_ORBInitializer (void); - virtual void pre_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init(PortableInterceptor::ORBInitInfo*); - virtual void post_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init(PortableInterceptor::ORBInitInfo*); private: PortableInterceptor::ClientRequestInterceptor_var interceptor_; diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp index 416f20365b5..5a84ba9b191 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp @@ -30,14 +30,12 @@ namespace Test char * Client_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Client_Request_Interceptor"); } void Client_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod) - ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("CRI (%P|%t) Test accessing Transport Current from %s\n"), @@ -61,13 +59,11 @@ namespace Test void Client_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { //Test TC test_transport_current ("send_request"); @@ -106,28 +102,24 @@ namespace Test void Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { test_transport_current ("send_poll"); } void Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { test_transport_current ("receive_reply"); } void Client_Request_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("receive_exception"); } void Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("receive_other"); } diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h index 97b726a1fd2..a4e2a7999bc 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h @@ -72,21 +72,16 @@ namespace Test virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri); //@} // Number of interceptions @@ -95,8 +90,7 @@ namespace Test private: // Implementation method, every inteception point will have to // call it, supplying a name. - void test_transport_current (const ACE_TCHAR* amethod) - ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException)); + void test_transport_current (const ACE_TCHAR* amethod); private: ///The ID of the ORB this interceptor is registered with. diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h index 2e0a1a8a1bc..af5670ca526 100644 --- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h +++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h @@ -42,8 +42,7 @@ public: /// No-op method used so that a client request interceptor will be /// invoked when invoking this method from the above invoke_me() /// method. Say that 10 times fast. :-) - virtual void invoked_during_upcall (void) - ACE_THROW_SPEC ((::CORBA::SystemException)); + virtual void invoked_during_upcall (void); /// Shutdown the ORB. virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -60,8 +59,7 @@ private: void test_transport_current (void) ACE_THROW_SPEC ((::CORBA::SystemException)); /// Main servant test method. - void invoked_by_client_i (void) - ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext)); + void invoked_by_client_i (void); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp index e7c4551b6ab..8e866e97052 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp @@ -27,14 +27,12 @@ namespace Test void Server_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)) { /* no-op */ } // A specialization to handle client-side interceptors void Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii) - ACE_THROW_SPEC ((CORBA::SystemException)) { oii->add_server_request_interceptor (this->interceptor_.in ()); } diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h index a39ca925359..e9d517c30bd 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h @@ -35,11 +35,9 @@ namespace Test Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor); virtual ~Server_ORBInitializer (void); - virtual void pre_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init(PortableInterceptor::ORBInitInfo*); - virtual void post_init(PortableInterceptor::ORBInitInfo*) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init(PortableInterceptor::ORBInitInfo*); private: PortableInterceptor::ServerRequestInterceptor_var interceptor_; diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp index 024c0f6fe77..c0e7d2c218a 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp @@ -25,7 +25,6 @@ namespace Test void Server_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod) - ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var name (this->name ()); ACE_DEBUG ((LM_DEBUG, @@ -71,48 +70,41 @@ namespace Test char * Server_Request_Interceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("SRI "); } void Server_Request_Interceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("receive_request_service_contexts"); } void Server_Request_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("receive_request"); } void Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { test_transport_current ("send_reply"); } void Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("send_exception"); } void Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { test_transport_current ("send_other"); } diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h index b34c1ec6a4e..7776b86354a 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h @@ -57,8 +57,7 @@ namespace Test /// Destructor. virtual ~Server_Request_Interceptor (void); - virtual void test_transport_current (const char* amethod) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void test_transport_current (const char* amethod); /// Coherency test virtual bool self_test (void); @@ -77,20 +76,15 @@ namespace Test virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri); //@} protected: |