diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Request_Interceptor_Flow')
11 files changed, 79 insertions, 95 deletions
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 3661e72841f..642c66c8913 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp @@ -26,7 +26,6 @@ Client_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; // Create and register the test request interceptors. PortableInterceptor::ClientRequestInterceptor_ptr ci = @@ -43,8 +42,8 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var ci_interceptor = ci; - info->add_client_request_interceptor (ci_interceptor.in (), - ACE_TRY_ENV); + info->add_client_request_interceptor (ci_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_NEW_THROW_EX (ci, @@ -58,8 +57,8 @@ Client_ORBInitializer::post_init ( ci_interceptor = ci; - info->add_client_request_interceptor (ci_interceptor.in (), - ACE_TRY_ENV); + info->add_client_request_interceptor (ci_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_NEW_THROW_EX (ci, @@ -73,7 +72,7 @@ Client_ORBInitializer::post_init ( ci_interceptor = ci; - info->add_client_request_interceptor (ci_interceptor.in (), - ACE_TRY_ENV); + info->add_client_request_interceptor (ci_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } 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 9eceac9aa11..5cb7411e4ee 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,10 +19,9 @@ Client_Request_Interceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean client_side = - this->client_side_test (ri, ACE_TRY_ENV); + this->client_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -36,7 +35,7 @@ Client_Request_Interceptor::send_request ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -79,10 +78,9 @@ Client_Request_Interceptor::send_poll ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean client_side = - this->client_side_test (ri, ACE_TRY_ENV); + this->client_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -101,10 +99,9 @@ Client_Request_Interceptor::receive_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean client_side = - this->client_side_test (ri, ACE_TRY_ENV); + this->client_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -120,7 +117,7 @@ Client_Request_Interceptor::receive_reply ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -162,10 +159,9 @@ Client_Request_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean client_side = - this->client_side_test (ri, ACE_TRY_ENV); + this->client_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -181,7 +177,7 @@ Client_Request_Interceptor::receive_exception ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -196,12 +192,12 @@ Client_Request_Interceptor::receive_exception ( switch (scenario) { case 4: - exception = ri->received_exception (ACE_TRY_ENV); + exception = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; tc = exception->type (); - id = tc->id (ACE_TRY_ENV); + id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0) @@ -247,10 +243,9 @@ Client_Request_Interceptor::receive_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean client_side = - this->client_side_test (ri, ACE_TRY_ENV); + this->client_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!client_side) @@ -265,10 +260,10 @@ Client_Request_Interceptor::receive_other ( CORBA::Boolean Client_Request_Interceptor::client_side_test ( - PortableInterceptor::ClientRequestInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV) + PortableInterceptor::ClientRequestInfo_ptr info + TAO_ENV_ARG_DECL) { - CORBA::String_var op = info->operation (ACE_TRY_ENV); + CORBA::String_var op = info->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return ACE_OS_String::strcmp (op.in (), "client_test") == 0 ? 1 : 0; 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 ac150fb9ea7..c7fe08002a5 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 @@ -94,8 +94,8 @@ private: // Returns 1 if the client-side test is currently being run, and 0 // otherwise. CORBA::Boolean client_side_test ( - PortableInterceptor::ClientRequestInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV); + PortableInterceptor::ClientRequestInfo_ptr info + TAO_ENV_ARG_DECL); }; 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 57fc83eae65..a9e5723dc47 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -25,7 +25,6 @@ void Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; CORBA::ULong s_count = this->starting_interception_point_count_.value (); 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 c6b994c7f66..1e5ef57fd73 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp @@ -26,7 +26,6 @@ Server_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; // Create and register the test request interceptors. PortableInterceptor::ServerRequestInterceptor_ptr si = @@ -43,8 +42,8 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var si_interceptor = si; - info->add_server_request_interceptor (si_interceptor.in (), - ACE_TRY_ENV); + info->add_server_request_interceptor (si_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_NEW_THROW_EX (si, @@ -58,8 +57,8 @@ Server_ORBInitializer::post_init ( si_interceptor = si; - info->add_server_request_interceptor (si_interceptor.in (), - ACE_TRY_ENV); + info->add_server_request_interceptor (si_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_NEW_THROW_EX (si, @@ -73,7 +72,7 @@ Server_ORBInitializer::post_init ( si_interceptor = si; - info->add_server_request_interceptor (si_interceptor.in (), - ACE_TRY_ENV); + info->add_server_request_interceptor (si_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } 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 b45a3e8fb41..625574cfa47 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 @@ -21,10 +21,9 @@ Server_Request_Interceptor::receive_request_service_contexts ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean server_side = - this->server_side_test (ri, ACE_TRY_ENV); + this->server_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -69,10 +68,9 @@ Server_Request_Interceptor::receive_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean server_side = - this->server_side_test (ri, ACE_TRY_ENV); + this->server_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -89,10 +87,9 @@ Server_Request_Interceptor::send_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean server_side = - this->server_side_test (ri, ACE_TRY_ENV); + this->server_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -108,7 +105,7 @@ Server_Request_Interceptor::send_reply ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -150,10 +147,9 @@ Server_Request_Interceptor::send_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean server_side = - this->server_side_test (ri, ACE_TRY_ENV); + this->server_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -169,7 +165,7 @@ Server_Request_Interceptor::send_exception ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test::TestScenario scenario; @@ -184,12 +180,12 @@ Server_Request_Interceptor::send_exception ( switch (scenario) { case 4: - exception = ri->sending_exception (ACE_TRY_ENV); + exception = ri->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; tc = exception->type (); - id = tc->id (ACE_TRY_ENV); + id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS_String::strcmp (id, "IDL:Test/X:1.0") == 0) @@ -235,10 +231,9 @@ Server_Request_Interceptor::send_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean server_side = - this->server_side_test (ri, ACE_TRY_ENV); + this->server_side_test (ri TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (!server_side) @@ -253,10 +248,10 @@ Server_Request_Interceptor::send_other ( CORBA::Boolean Server_Request_Interceptor::server_side_test ( - PortableInterceptor::ServerRequestInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV) + PortableInterceptor::ServerRequestInfo_ptr info + TAO_ENV_ARG_DECL) { - CORBA::String_var op = info->operation (ACE_TRY_ENV); + CORBA::String_var op = info->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); return ACE_OS_String::strcmp (op.in (), "server_test") == 0 ? 1 : 0; 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 1b70a2f41c6..1e6c84778ad 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 @@ -96,8 +96,8 @@ private: /// Returns 1 if the server-side test is currently being run, and 0 /// otherwise. CORBA::Boolean server_side_test ( - PortableInterceptor::ServerRequestInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV); + PortableInterceptor::ServerRequestInfo_ptr info + TAO_ENV_ARG_DECL); private: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 181e9df512d..1a99d53e0f2 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -41,7 +41,7 @@ parse_args (int argc, char *argv[]) } void -client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) +client_test (Test_ptr server TAO_ENV_ARG_DECL) { // Currently, there are only four scenarios for the client side // tests. @@ -56,7 +56,7 @@ client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - server->client_test (i, ACE_TRY_ENV); + server->client_test (i TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::X, ex) @@ -89,7 +89,7 @@ client_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) } void -server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) +server_test (Test_ptr server TAO_ENV_ARG_DECL) { // Currently, there are only four scenarios for the server side // tests. @@ -104,7 +104,7 @@ server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - server->server_test (i, ACE_TRY_ENV); + server->server_test (i TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test::X, ex) @@ -139,7 +139,7 @@ server_test (Test_ptr server, CORBA::Environment &ACE_TRY_ENV) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -151,25 +151,25 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (orb_initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "Client ORB", - ACE_TRY_ENV); + "Client ORB" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_var server = - Test::_narrow (object.in (), ACE_TRY_ENV); + Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -180,13 +180,13 @@ main (int argc, char *argv[]) 1); } - ::client_test (server.in (), ACE_TRY_ENV); + ::client_test (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ::server_test (server.in (), ACE_TRY_ENV); + ::server_test (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp index f89e7c4e978..f3b08527929 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -43,7 +43,7 @@ parse_args (int argc, char *argv[]) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { Server_ORBInitializer *temp_initializer = 0; @@ -53,16 +53,16 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (orb_initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (orb_initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "Server ORB", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "Server ORB" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -71,11 +71,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) @@ -83,18 +83,18 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); - CORBA::Object_var obj = servant._this (ACE_TRY_ENV); + CORBA::Object_var obj = servant._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (obj.in (), ACE_TRY_ENV); + orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Servant:\n<%s>\n", ior.in ())); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Write IOR to a file. @@ -109,13 +109,13 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); 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 9717d06b34b..682c1eec724 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -12,8 +12,8 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::client_test (Test::TestScenario scenario, - CORBA::Environment &ACE_TRY_ENV) +test_i::client_test (Test::TestScenario scenario + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)) @@ -34,8 +34,8 @@ test_i::client_test (Test::TestScenario scenario, } void -test_i::server_test (Test::TestScenario scenario, - CORBA::Environment &ACE_TRY_ENV) +test_i::server_test (Test::TestScenario scenario + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)) @@ -56,11 +56,11 @@ test_i::server_test (Test::TestScenario scenario, } void -test_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } 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 af862f149d9..d0a480c43d7 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -33,24 +33,21 @@ public: test_i (CORBA::ORB_ptr orb); /// The client-side test operation. - virtual void client_test (Test::TestScenario scenario, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void client_test (Test::TestScenario scenario + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)); /// The server-side test operation. - virtual void server_test (Test::TestScenario scenario, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void server_test (Test::TestScenario scenario + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((Test::X, Test::UnknownScenario, CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: |