diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
| commit | b11770b30f8b58d20fe2d61846bfa3fc5354ee7e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tests/Portable_Interceptors | |
| parent | 8fd5b8293423d91c699711bce0f3551cb8c20a69 (diff) | |
| download | ATCD-b11770b30f8b58d20fe2d61846bfa3fc5354ee7e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tests/Portable_Interceptors')
55 files changed, 440 insertions, 527 deletions
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index 7a1d81fa95e..2e59b25ca5c 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -28,7 +28,6 @@ Client_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; PortableInterceptor::ClientRequestInterceptor_ptr tmp = PortableInterceptor::ClientRequestInterceptor::_nil (); @@ -68,7 +67,7 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp; - info->add_client_request_interceptor (interceptor.in (), - ACE_TRY_ENV); + info->add_client_request_interceptor (interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp index 7c0e609f4a5..c1cabcaa2d4 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -30,7 +30,6 @@ Server_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; PortableInterceptor::ServerRequestInterceptor_ptr tmp = PortableInterceptor::ServerRequestInterceptor::_nil (); @@ -70,7 +69,7 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp; - info->add_server_request_interceptor (interceptor.in (), - ACE_TRY_ENV); + info->add_server_request_interceptor (interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index dba57b7a213..32370917a2d 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -49,8 +49,8 @@ parse_args (int argc, char *argv[]) void -run_test (Test_Interceptors::Secure_Vault_ptr server, - CORBA::Environment &ACE_TRY_ENV) +run_test (Test_Interceptors::Secure_Vault_ptr server + TAO_ENV_ARG_DECL) { int i = 0; const char user[] = "root"; @@ -68,7 +68,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server, // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - server->ready (ACE_TRY_ENV); + server->ready (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Grab timestamp again. @@ -96,7 +96,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server, // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - server->authenticate (user, ACE_TRY_ENV); + server->authenticate (user TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Grab timestamp again. @@ -133,8 +133,8 @@ run_test (Test_Interceptors::Secure_Vault_ptr server, ACE_hrtime_t latency_base = ACE_OS::gethrtime (); server->update_records (id, - record, - ACE_TRY_ENV); + record + TAO_ENV_ARG_PARAMETER); // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -190,24 +190,24 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" 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_Interceptors::Secure_Vault_var server = - Test_Interceptors::Secure_Vault::_narrow (object.in (), - ACE_TRY_ENV); + Test_Interceptors::Secure_Vault::_narrow (object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -223,10 +223,10 @@ main (int argc, char *argv[]) // This test is useful for benchmarking the differences when // the same method is intercepted by different interceptors // wanting to achieve different functionality. - run_test (server.in (), ACE_TRY_ENV); + run_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/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp index 937fca29e1b..9c9eb160a09 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp @@ -61,9 +61,8 @@ Vault_Client_Request_Interceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "authenticate") == 0) @@ -82,14 +81,14 @@ Vault_Client_Request_Interceptor::send_request ( sc.context_data.replace (string_len, string_len, buf, 1); // Add this context to the service context list. - ri->add_request_service_context (sc, 0, ACE_TRY_ENV); + ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; } if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test_Interceptors::Secure_Vault::Record *record; @@ -107,15 +106,14 @@ Vault_Client_Request_Interceptor::receive_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_TRY_ENV); + CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -139,18 +137,17 @@ Vault_Client_Request_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::Any_var any = ri->received_exception (ACE_TRY_ENV); + CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_TRY_ENV); + const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var exception_id = - ri->received_exception_id (ACE_TRY_ENV); + ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (id, exception_id.in ()) != 0) @@ -214,16 +211,15 @@ Vault_Server_Request_Interceptor::receive_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id, ACE_TRY_ENV); + ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = @@ -237,7 +233,7 @@ Vault_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test_Interceptors::Secure_Vault::Record *record; @@ -255,15 +251,14 @@ Vault_Server_Request_Interceptor::send_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_TRY_ENV); + CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -347,7 +342,6 @@ Vault_Client_Request_Context_Interceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; // MAke the context to send the context to the target IOP::ServiceContext sc; @@ -366,7 +360,7 @@ Vault_Client_Request_Context_Interceptor::send_request ( sc.context_data.replace (string_len, string_len, buf, 1); // Add this context to the service context list. - ri->add_request_service_context (sc, 0, ACE_TRY_ENV); + ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -396,18 +390,17 @@ Vault_Client_Request_Context_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::Any_var any = ri->received_exception (ACE_TRY_ENV); + CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_TRY_ENV); + const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var exception_id = - ri->received_exception_id (ACE_TRY_ENV); + ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (id, exception_id.in ()) != 0) @@ -473,11 +466,10 @@ Vault_Server_Request_Context_Interceptor::receive_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id, ACE_TRY_ENV); + ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = ACE_reinterpret_cast (const char *, @@ -571,15 +563,14 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *user; @@ -591,7 +582,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test_Interceptors::Secure_Vault::Record *record; @@ -609,16 +600,15 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "ready") == 0) { CORBA::Short result; - CORBA::Any_var result_any = ri->result (ACE_TRY_ENV); + CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -628,7 +618,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_TRY_ENV); + CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -652,18 +642,17 @@ Vault_Client_Request_Dynamic_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::Any_var any = ri->received_exception (ACE_TRY_ENV); + CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_TRY_ENV); + const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var exception_id = - ri->received_exception_id (ACE_TRY_ENV); + ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (id, exception_id.in ()) != 0) @@ -719,15 +708,14 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *user; @@ -739,7 +727,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Test_Interceptors::Secure_Vault::Record *record; @@ -767,15 +755,14 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "ready") == 0) { CORBA::Short result; - CORBA::Any_var result_any = ri->result (ACE_TRY_ENV); + CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -784,7 +771,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_TRY_ENV); + CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -894,18 +881,17 @@ Vault_Client_Request_NOOP_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::Any_var any = ri->received_exception (ACE_TRY_ENV); + CORBA::Any_var any = ri->received_exception (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_TRY_ENV); + const char *id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var exception_id = - ri->received_exception_id (ACE_TRY_ENV); + ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (id, exception_id.in ()) != 0) diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp index 50fbc18e35e..c25209504bb 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -52,19 +52,19 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; 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 ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -72,35 +72,35 @@ 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; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Secure_Vault_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl, - ACE_TRY_ENV); + root_poa->activate_object (&server_impl + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + root_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Secure_Vault_var server = - Test_Interceptors::Secure_Vault::_narrow (test_obj.in (), - ACE_TRY_ENV); + Test_Interceptors::Secure_Vault::_narrow (test_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -120,12 +120,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index 934e5482291..748820c893b 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -12,15 +12,15 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb) // ctor CORBA::Short -Secure_Vault_i::ready (CORBA::Environment &) +Secure_Vault_i::ready (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void -Secure_Vault_i::authenticate (const char * user, - CORBA::Environment &ACE_TRY_ENV) +Secure_Vault_i::authenticate (const char * user + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Invalid)) { @@ -31,16 +31,16 @@ Secure_Vault_i::authenticate (const char * user, CORBA::Long Secure_Vault_i::update_records (CORBA::Long, - const Test_Interceptors::Secure_Vault::Record &, - CORBA::Environment &) + const Test_Interceptors::Secure_Vault::Record & + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; } void -Secure_Vault_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +Secure_Vault_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index 573c522a3e0..07891acfc20 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -27,25 +27,21 @@ public: Secure_Vault_i (CORBA::ORB_ptr orb); // ctor - virtual CORBA::Short ready (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Short ready (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void authenticate (const char * user, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void authenticate (const char * user + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Invalid)); // Passwd sent in the service context list virtual CORBA::Long update_records (CORBA::Long id, - const Test_Interceptors::Secure_Vault::Record & val, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + const Test_Interceptors::Secure_Vault::Record & val + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - 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: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index 09676fcd3d3..bd736641a5a 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -24,7 +24,6 @@ Echo_Client_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; PortableInterceptor::ClientRequestInterceptor_ptr interceptor = PortableInterceptor::ClientRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index c6b393e442c..3951c2527a6 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -24,7 +24,6 @@ Echo_Server_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; PortableInterceptor::ServerRequestInterceptor_ptr interceptor = PortableInterceptor::ServerRequestInterceptor::_nil (); diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index edb75f81cb8..d725bb1c6d7 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -38,16 +38,16 @@ parse_args (int argc, char *argv[]) } void -run_test (Test_Interceptors::Visual_ptr server, - CORBA::Environment &ACE_TRY_ENV) +run_test (Test_Interceptors::Visual_ptr server + TAO_ENV_ARG_DECL) { - server->normal (10, ACE_TRY_ENV); + server->normal (10 TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Long one = 1, two = 1, result = 0; result = server->calculate (one, - two, - ACE_TRY_ENV); + two + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -57,7 +57,7 @@ run_test (Test_Interceptors::Visual_ptr server, ACE_TRY { - server->user (ACE_TRY_ENV); + server->user (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test_Interceptors::Silly, userex) @@ -69,7 +69,7 @@ run_test (Test_Interceptors::Visual_ptr server, ACE_TRY_EX (SYS) { - server->system (ACE_TRY_ENV); + server->system (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -93,23 +93,23 @@ 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, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" 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_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in (), ACE_TRY_ENV); + Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -120,9 +120,9 @@ main (int argc, char *argv[]) 1); } - run_test (server.in (), ACE_TRY_ENV); + run_test (server.in () TAO_ENV_ARG_PARAMETER); - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp index 093a0497204..c3292620654 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.cpp @@ -64,9 +64,8 @@ Echo_Client_Request_Interceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -77,7 +76,7 @@ Echo_Client_Request_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param; @@ -98,9 +97,8 @@ Echo_Client_Request_Interceptor::receive_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -115,9 +113,8 @@ Echo_Client_Request_Interceptor::receive_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -128,7 +125,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param; @@ -143,7 +140,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param1, param2, result; @@ -152,7 +149,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_TRY_ENV); + CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -172,9 +169,8 @@ Echo_Client_Request_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -184,7 +180,7 @@ Echo_Client_Request_Interceptor::receive_exception ( CORBA::String_var exception_id = - ri->received_exception_id (ACE_TRY_ENV); + ri->received_exception_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -244,9 +240,8 @@ Echo_Server_Request_Interceptor::receive_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -256,7 +251,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param; @@ -271,7 +266,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_TRY_ENV); + ri->target_most_derived_interface (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -285,9 +280,8 @@ Echo_Server_Request_Interceptor::send_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -297,7 +291,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param; @@ -312,7 +306,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_TRY_ENV); + ri->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long param1, param2, result = 0; @@ -321,7 +315,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - CORBA::Any_var result_any = ri->result (ACE_TRY_ENV); + CORBA::Any_var result_any = ri->result (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; (result_any.in ()) >>= result; @@ -341,9 +335,8 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -353,12 +346,12 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_TRY_ENV); + ri->sending_exception (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (ACE_TRY_ENV); + const char *exception_id = type->id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h index fccabebecf0..68777008e86 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/interceptors.h @@ -42,7 +42,7 @@ public: virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException @@ -65,7 +65,7 @@ public: virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - + virtual void receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri TAO_ENV_ARG_DECL_WITH_DEFAULTS) @@ -123,10 +123,10 @@ public: TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - + virtual void send_other ( PortableInterceptor::ServerRequestInfo_ptr - TAO_ENV_ARG_DECL_WITH_DEFAULTS + TAO_ENV_ARG_DECL_WITH_DEFAULTS ) ACE_THROW_SPEC (( CORBA::SystemException, diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 7ac5b662972..3acaf0dba2f 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -50,16 +50,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, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" 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 ())) @@ -68,14 +68,14 @@ 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; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -84,22 +84,22 @@ main (int argc, char *argv[]) Visual_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl, - ACE_TRY_ENV); + root_poa->activate_object (&server_impl + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + root_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in (), - ACE_TRY_ENV); + Test_Interceptors::Visual::_narrow (test_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -117,12 +117,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index 731f0b30ea8..64c80dd0a86 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -11,8 +11,8 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) // ctor void -Visual_i::normal (CORBA::Long arg, - CORBA::Environment&) +Visual_i::normal (CORBA::Long arg + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); @@ -20,8 +20,8 @@ Visual_i::normal (CORBA::Long arg, CORBA::Long Visual_i::calculate (CORBA::Long one, - CORBA::Long two, - CORBA::Environment&) + CORBA::Long two + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n")); @@ -29,7 +29,7 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (CORBA::Environment &ACE_TRY_ENV) +Visual_i::user (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); @@ -37,7 +37,7 @@ Visual_i::user (CORBA::Environment &ACE_TRY_ENV) } void -Visual_i::system (CORBA::Environment &ACE_TRY_ENV) +Visual_i::system (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,7 +45,7 @@ Visual_i::system (CORBA::Environment &ACE_TRY_ENV) } void -Visual_i::shutdown (CORBA::Environment&) +Visual_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) 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 5def6b74e00..1c679a55b7c 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -27,23 +27,23 @@ public: Visual_i (CORBA::ORB_ptr orb); // ctor - void normal (CORBA::Long arg, - CORBA::Environment&) + void normal (CORBA::Long arg + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::Long calculate ( CORBA::Long one, - CORBA::Long two, - CORBA::Environment&) + CORBA::Long two + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (CORBA::Environment&) + void user (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); - void system (CORBA::Environment&) + void system (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment&) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp index 5679d03a868..8ff1de5e5be 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -26,12 +26,10 @@ Client_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - - CORBA::String_var orb_id = info->orb_id (ACE_TRY_ENV); + CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::StringSeq_var args = info->arguments (ACE_TRY_ENV); + CORBA::StringSeq_var args = info->arguments (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var forward_str; diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp index c180e9e2067..104ad3d7681 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -38,12 +38,10 @@ Client_Request_Interceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - ++this->request_count_; CORBA::Boolean response_expected = - ri->response_expected (ACE_TRY_ENV); + ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected) // A one-way request. @@ -59,19 +57,19 @@ Client_Request_Interceptor::send_request ( int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in (), - ACE_TRY_ENV); + this->orb_id_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } CORBA::Object_var forward = - this->orb_->string_to_object (this->forward_str_.in (), - ACE_TRY_ENV); + this->orb_->string_to_object (this->forward_str_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var forward_str = - this->orb_->object_to_string (forward.in (), - ACE_TRY_ENV); + this->orb_->object_to_string (forward.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -118,14 +116,13 @@ Client_Request_Interceptor::receive_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; CORBA::Boolean response_expected = - ri->response_expected (ACE_TRY_ENV); + ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableInterceptor::ReplyStatus reply_status = - ri->reply_status (ACE_TRY_ENV); + ri->reply_status (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected // A one-way or asynchronous request. @@ -139,7 +136,7 @@ Client_Request_Interceptor::receive_other ( // This will throw an exception if a location forward has not // occured. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. - CORBA::Object_var forward = ri->forward_reference (ACE_TRY_ENV); + CORBA::Object_var forward = ri->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (forward.in ())) diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp index 5727f3bed21..9fed7eb387f 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp @@ -29,8 +29,6 @@ Server_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - PortableInterceptor::ServerRequestInterceptor_ptr interceptor; // Install the server request interceptor. ACE_NEW_THROW_EX (interceptor, @@ -44,8 +42,8 @@ Server_ORBInitializer::post_init ( this->server_interceptor_ = interceptor; - info->add_server_request_interceptor (interceptor, - ACE_TRY_ENV); + info->add_server_request_interceptor (interceptor + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp index 81b29ec8b2e..650431f5134 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -20,8 +20,8 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) void Server_Request_Interceptor::forward_references ( CORBA::Object_ptr obj1, - CORBA::Object_ptr obj2, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Object_ptr obj2 + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2)) @@ -57,12 +57,10 @@ Server_Request_Interceptor::receive_request_service_contexts ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - this->request_count_++; CORBA::Boolean response_expected = - ri->response_expected (ACE_TRY_ENV); + ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected) // A one-way request. @@ -99,10 +97,8 @@ Server_Request_Interceptor::receive_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::Boolean response_expected = - ri->response_expected (ACE_TRY_ENV); + ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected) // A one-way request. @@ -160,10 +156,8 @@ Server_Request_Interceptor::send_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::Boolean response_expected = - ri->response_expected (ACE_TRY_ENV); + ri->response_expected (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (!response_expected) // A one-way request. @@ -175,7 +169,7 @@ Server_Request_Interceptor::send_other ( // This will throw an exception if a location forward has not // occured. If an exception is thrown then something is wrong with // the PortableInterceptor::ForwardRequest support. - CORBA::Object_var forward = ri->forward_reference (ACE_TRY_ENV); + CORBA::Object_var forward = ri->forward_reference (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (forward.in ())) diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h index 4ff3b9871cc..189fa3d6ee0 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h @@ -68,9 +68,8 @@ public: /// Set the references to which requests will be forwarded. virtual void forward_references (CORBA::Object_ptr obj1, - CORBA::Object_ptr obj2, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + CORBA::Object_ptr obj2 + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp index 8aefaba9f60..0d3e80d0426 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -50,7 +50,7 @@ main (int argc, char *argv[]) { int status = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { #if TAO_HAS_INTERCEPTORS == 1 @@ -63,15 +63,15 @@ 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; #endif /* TAO_HAS_INTERCEPTORS == 1 */ 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) @@ -81,11 +81,11 @@ main (int argc, char *argv[]) // IOR occurs during the various interceptions executed during // this test. CORBA::Object_var object = - orb->string_to_object (ior1, ACE_TRY_ENV); + orb->string_to_object (ior1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ForwardRequestTest::test_var server = - ForwardRequestTest::test::_narrow (object.in (), ACE_TRY_ENV); + ForwardRequestTest::test::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -112,7 +112,7 @@ main (int argc, char *argv[]) if (i > 1) old_number = number; - number = server->number (ACE_TRY_ENV); + number = server->number (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -141,7 +141,7 @@ main (int argc, char *argv[]) } } - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp index 9eadd3a9241..cdfc78c8ac8 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -56,7 +56,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; @@ -66,16 +66,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 ())) @@ -84,11 +84,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) @@ -102,22 +102,22 @@ main (int argc, char *argv[]) PortableServer::POA_var first_poa = root_poa->create_POA ("first POA", poa_manager.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var oid1 = - first_poa->activate_object (&servant1, - ACE_TRY_ENV); + first_poa->activate_object (&servant1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj1 = - first_poa->servant_to_reference (&servant1, - ACE_TRY_ENV); + first_poa->servant_to_reference (&servant1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior1 = - orb->object_to_string (obj1.in (), ACE_TRY_ENV); + orb->object_to_string (obj1.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -130,29 +130,29 @@ main (int argc, char *argv[]) PortableServer::POA_var second_poa = root_poa->create_POA ("second POA", poa_manager.in (), - policies, - ACE_TRY_ENV); + policies + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var oid2 = - second_poa->activate_object (&servant2, - ACE_TRY_ENV); + second_poa->activate_object (&servant2 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj2 = - second_poa->servant_to_reference (&servant2, - ACE_TRY_ENV); + second_poa->servant_to_reference (&servant2 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior2 = - orb->object_to_string (obj2.in (), ACE_TRY_ENV); + orb->object_to_string (obj2.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 2: <%s>\n", ior2.in ())); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Set the forward references in the server request interceptor. @@ -161,7 +161,7 @@ main (int argc, char *argv[]) ForwardRequestTest::ServerRequestInterceptor_var interceptor = ForwardRequestTest::ServerRequestInterceptor::_narrow ( - server_interceptor.in (), ACE_TRY_ENV); + server_interceptor.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (interceptor.in ())) @@ -171,8 +171,8 @@ main (int argc, char *argv[]) -1); interceptor->forward_references (obj1.in (), - obj2.in (), - ACE_TRY_ENV); + obj2.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Write each IOR to a file. @@ -199,13 +199,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/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp index edd9b01080e..abe34922f30 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp @@ -18,18 +18,18 @@ test_i::~test_i (void) } CORBA::Short -test_i::number (CORBA::Environment &) +test_i::number (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } 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_DEBUG, "Server is shutting down via object %d.\n", this->number_)); - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h index 261f380aba6..04ef8b96d8e 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h @@ -37,13 +37,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Short number (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((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: diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index f583ef93960..2adf3bbcd2e 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -28,14 +28,12 @@ FOO_ClientRequestInterceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - // Verify that the tagged component that was supposed to be embedded // into the IOR by the FOO_IORInterceptor is actually in the IOR // profile. IOP::TaggedComponent_var component = - ri->get_effective_component (FOO::COMPONENT_ID, - ACE_TRY_ENV); + ri->get_effective_component (FOO::COMPONENT_ID + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // The correct tagged component appears to exist. Display the diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp index 7a1e9bf9ea6..1986211dd64 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp @@ -21,8 +21,6 @@ FOO_Client_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - PortableInterceptor::ClientRequestInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, FOO_ClientRequestInterceptor, @@ -36,7 +34,7 @@ FOO_Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var interceptor = foo; - info->add_client_request_interceptor (interceptor.in (), - ACE_TRY_ENV); + info->add_client_request_interceptor (interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp index 8e5c94b4a99..3781f73dd95 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp @@ -21,7 +21,6 @@ FOO_IORInterceptor_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; PortableInterceptor::IORInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -36,7 +35,7 @@ FOO_IORInterceptor_ORBInitializer::post_init ( PortableInterceptor::IORInterceptor_var ior_interceptor = foo; - info->add_ior_interceptor (ior_interceptor.in (), - ACE_TRY_ENV); + info->add_ior_interceptor (ior_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index e5d7604a380..53095e667a2 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -37,7 +37,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 { #if TAO_HAS_INTERCEPTORS == 1 @@ -50,24 +50,24 @@ 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; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_orb", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; FOO::test_var server = - FOO::test::_narrow (obj.in (), ACE_TRY_ENV); + FOO::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -78,7 +78,7 @@ main (int argc, char *argv[]) 1); } - server->shutdown (ACE_TRY_ENV); + server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index c67e5c3c709..1dc39b2df36 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -39,7 +39,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 { #if TAO_HAS_INTERCEPTORS == 1 @@ -52,25 +52,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; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - "test_orb", - ACE_TRY_ENV); + "test_orb" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -79,10 +79,10 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -90,11 +90,11 @@ main (int argc, char *argv[]) test_i server_impl (orb.in ()); - obj = server_impl._this (ACE_TRY_ENV); + obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - FOO::test_var server = FOO::test::_narrow (obj.in (), - ACE_TRY_ENV); + FOO::test_var server = FOO::test::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -104,7 +104,7 @@ main (int argc, char *argv[]) -1); CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "FOO::test: <%s>\n", ior.in ())); @@ -123,7 +123,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index f80354bf8d0..1bcd569d623 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -12,10 +12,10 @@ test_i::test_i (CORBA::ORB_ptr orb) } 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_DEBUG, "\"test_i\" 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/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index 693d577b31b..2309de5d64b 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 (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index 7f747dc9947..76c69b76129 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -23,9 +23,7 @@ ServerORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - - ::slot_id = info->allocate_slot_id (ACE_TRY_ENV); + ::slot_id = info->allocate_slot_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_ptr tmp; @@ -40,7 +38,7 @@ ServerORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp; - info->add_server_request_interceptor (interceptor.in (), - ACE_TRY_ENV); + info->add_server_request_interceptor (interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index dae6f2b6a99..4f7354e6843 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -34,9 +34,8 @@ ServerRequestInterceptor::receive_request_service_contexts ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) @@ -51,7 +50,7 @@ ServerRequestInterceptor::receive_request_service_contexts ( ACE_TRY { - ri->set_slot (this->slot_id_, data, ACE_TRY_ENV); + ri->set_slot (this->slot_id_, data TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) @@ -89,9 +88,8 @@ ServerRequestInterceptor::send_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var op = ri->operation (ACE_TRY_ENV); + CORBA::String_var op = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (ACE_OS::strcmp (op.in (), "invoke_me") != 0) @@ -104,7 +102,7 @@ ServerRequestInterceptor::send_reply ( // Retrieve the data stored in the RSC. This data should be // different from the original data stored into the RSC by the // receive_request_service_contexts() interception point. - data = ri->get_slot (this->slot_id_, ACE_TRY_ENV); + data = ri->get_slot (this->slot_id_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index e2638125471..86a6cc69e5b 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -37,7 +37,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 { #if 0 @@ -50,24 +50,24 @@ 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; #endif /* 0 */ CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "client_orb", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "client_orb" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PICurrentTest::test_var server = - PICurrentTest::test::_narrow (obj.in (), ACE_TRY_ENV); + PICurrentTest::test::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -78,10 +78,10 @@ main (int argc, char *argv[]) 1); } - server->invoke_me (ACE_TRY_ENV); + server->invoke_me (TAO_ENV_SINGLE_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/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 32568337887..85b1c03a21c 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -41,7 +41,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 { PortableInterceptor::ORBInitializer_ptr temp_initializer = @@ -53,23 +53,23 @@ 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, - "test_orb", - ACE_TRY_ENV); + "test_orb" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA", - ACE_TRY_ENV); + orb->resolve_initial_references ("RootPOA" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -78,20 +78,20 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return -1; - obj = orb->resolve_initial_references ("PICurrent", ACE_TRY_ENV); + obj = orb->resolve_initial_references ("PICurrent" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableInterceptor::Current_var pi_current = - PortableInterceptor::Current::_narrow (obj.in (), ACE_TRY_ENV); + PortableInterceptor::Current::_narrow (obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (pi_current.in ())) @@ -103,12 +103,12 @@ main (int argc, char *argv[]) ::slot_id, orb.in ()); - obj = server_impl._this (ACE_TRY_ENV); + obj = server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PICurrentTest::test_var server = - PICurrentTest::test::_narrow (obj.in (), - ACE_TRY_ENV); + PICurrentTest::test::_narrow (obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -118,7 +118,7 @@ main (int argc, char *argv[]) -1); CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "PICurrentTest::test: <%s>\n", ior.in ())); @@ -137,7 +137,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "Event loop finished.\n")); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index bd0c90a8198..dbea3421c8e 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -20,7 +20,7 @@ test_i::~test_i (void) } void -test_i::invoke_me (CORBA::Environment &ACE_TRY_ENV) +test_i::invoke_me (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -39,7 +39,7 @@ test_i::invoke_me (CORBA::Environment &ACE_TRY_ENV) // receive_request_service_contexts() interception point, and // then copied into the TSC current. retrieved_any = - this->current_->get_slot (this->slot_id_, ACE_TRY_ENV); + this->current_->get_slot (this->slot_id_ TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) @@ -88,7 +88,7 @@ test_i::invoke_me (CORBA::Environment &ACE_TRY_ENV) ACE_TRY_EX (foo) { - this->current_->set_slot (this->slot_id_, data, ACE_TRY_ENV); + this->current_->set_slot (this->slot_id_, data TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (foo); } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) @@ -113,11 +113,11 @@ test_i::invoke_me (CORBA::Environment &ACE_TRY_ENV) } 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_DEBUG, "(%P|%t) 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/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index 598bdfba9a8..ed0f81b6c2d 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -38,13 +38,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual void invoke_me (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void invoke_me (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((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: 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: 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 a5a4f69e84e..4244d28739f 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -26,10 +26,9 @@ Client_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; CORBA::String_var orb_id = - info->orb_id (ACE_TRY_ENV); + info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_ptr interceptor = @@ -44,8 +43,8 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; - info->add_client_request_interceptor (client_interceptor.in (), - ACE_TRY_ENV); + info->add_client_request_interceptor (client_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } 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 5cd4a2011e2..6546f4ef6f9 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp @@ -26,8 +26,6 @@ Server_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - PortableInterceptor::ServerRequestInterceptor_ptr interceptor = PortableInterceptor::ServerRequestInterceptor::_nil (); @@ -40,8 +38,8 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; - info->add_server_request_interceptor (server_interceptor.in (), - ACE_TRY_ENV); + info->add_server_request_interceptor (server_interceptor.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp index 92ee62afd33..67ecc0f5985 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -36,23 +36,23 @@ parse_args (int argc, char *argv[]) } void -run_test (Test_Interceptors::Visual_ptr server, - CORBA::Environment &ACE_TRY_ENV) +run_test (Test_Interceptors::Visual_ptr server + TAO_ENV_ARG_DECL) { - server->normal (10, ACE_TRY_ENV); + server->normal (10 TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); - server->nothing (ACE_TRY_ENV); + server->nothing (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n")); ACE_TRY { - server->user (ACE_TRY_ENV); + server->user (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (Test_Interceptors::Silly, userex) @@ -64,7 +64,7 @@ run_test (Test_Interceptors::Visual_ptr server, ACE_TRY_EX (SYS) { - server->system (ACE_TRY_ENV); + server->system (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -88,23 +88,23 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" 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_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (object.in (), ACE_TRY_ENV); + Test_Interceptors::Visual::_narrow (object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) @@ -115,10 +115,10 @@ main (int argc, char *argv[]) 1); } - run_test (server.in (), ACE_TRY_ENV); + run_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/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp index bf1ddc0a93e..e370378705d 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp @@ -65,25 +65,24 @@ Echo_Client_Request_Interceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in (), - ACE_TRY_ENV); + this->orb_id_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_TRY_ENV); + CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var target = ri->target (ACE_TRY_ENV); + CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (target.in (), ACE_TRY_ENV); + this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -106,12 +105,12 @@ Echo_Client_Request_Interceptor::send_request ( sc.context_data.replace (string_len, string_len, buf, 1); // Add this context to the service context list. - ri->add_request_service_context (sc, 0, ACE_TRY_ENV); + ri->add_request_service_context (sc, 0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id, ACE_TRY_ENV); + ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = @@ -134,25 +133,24 @@ Echo_Client_Request_Interceptor::receive_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in (), - ACE_TRY_ENV); + this->orb_id_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_TRY_ENV); + CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var target = ri->target (ACE_TRY_ENV); + CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (target.in (), ACE_TRY_ENV); + this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -165,7 +163,7 @@ Echo_Client_Request_Interceptor::receive_reply ( // Check that the reply service context was received as // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id, ACE_TRY_ENV); + ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = @@ -183,7 +181,7 @@ Echo_Client_Request_Interceptor::receive_reply ( // Check that no one has messed with the request service context. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id, ACE_TRY_ENV); + ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = @@ -218,25 +216,24 @@ Echo_Client_Request_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; if (CORBA::is_nil (this->orb_.in ())) { int argc = 0; this->orb_ = CORBA::ORB_init (argc, 0, - this->orb_id_.in (), - ACE_TRY_ENV); + this->orb_id_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_TRY_ENV); + CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::Object_var target = ri->target (ACE_TRY_ENV); + CORBA::Object_var target = ri->target (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var ior = - this->orb_->object_to_string (target.in (), ACE_TRY_ENV); + this->orb_->object_to_string (target.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -249,7 +246,7 @@ Echo_Client_Request_Interceptor::receive_exception ( // Check that the reply service context was received as // expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id, ACE_TRY_ENV); + ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = @@ -267,7 +264,7 @@ Echo_Client_Request_Interceptor::receive_exception ( // Check that no one has messed with the request service context. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id, ACE_TRY_ENV); + ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = @@ -326,9 +323,8 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var operation = ri->operation (ACE_TRY_ENV); + CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -345,7 +341,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id, ACE_TRY_ENV); + ri->get_request_service_context (id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = @@ -375,7 +371,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( scc.context_data.replace (string_len, string_len, buff, 1); // Add this context to the service context list. - ri->add_reply_service_context (scc, 0, ACE_TRY_ENV); + ri->add_reply_service_context (scc, 0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -396,9 +392,8 @@ Echo_Server_Request_Interceptor::send_reply ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var operation = ri->operation (ACE_TRY_ENV); + CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -408,7 +403,7 @@ Echo_Server_Request_Interceptor::send_reply ( // Check that the reply service context is set as expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id, ACE_TRY_ENV); + ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = ACE_reinterpret_cast (const char *, @@ -427,7 +422,7 @@ Echo_Server_Request_Interceptor::send_reply ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id, ACE_TRY_ENV); + ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = ACE_reinterpret_cast (const char *, @@ -451,9 +446,8 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - TAO_ENV_ARG_DEFN; - CORBA::String_var operation = ri->operation (ACE_TRY_ENV); + CORBA::String_var operation = ri->operation (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -463,7 +457,7 @@ Echo_Server_Request_Interceptor::send_exception ( // Check that the reply service context is set as expected. IOP::ServiceContext_var sc = - ri->get_reply_service_context (::service_id, ACE_TRY_ENV); + ri->get_reply_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf = ACE_reinterpret_cast (const char *, @@ -482,7 +476,7 @@ Echo_Server_Request_Interceptor::send_exception ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc2 = - ri->get_request_service_context (::service_id, ACE_TRY_ENV); + ri->get_request_service_context (::service_id TAO_ENV_ARG_PARAMETER); ACE_CHECK; const char *buf2 = ACE_reinterpret_cast (const char *, diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index c59db7dad2e..b90dc3879b5 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -49,17 +49,17 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in (), - ACE_TRY_ENV); + PortableInterceptor::register_orb_initializer (initializer.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Now we can create the ORB CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" 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 ())) @@ -68,14 +68,14 @@ 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; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -84,22 +84,22 @@ main (int argc, char *argv[]) Visual_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl, - ACE_TRY_ENV); + root_poa->activate_object (&server_impl + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in (), - ACE_TRY_ENV); + root_poa->id_to_reference (id.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Test_Interceptors::Visual_var server = - Test_Interceptors::Visual::_narrow (test_obj.in (), - ACE_TRY_ENV); + Test_Interceptors::Visual::_narrow (test_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (server.in (), ACE_TRY_ENV); + orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, @@ -119,12 +119,12 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY 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 9c2439038eb..3d6d031610a 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -13,22 +13,22 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) } void -Visual_i::normal (CORBA::Long arg, - CORBA::Environment &) +Visual_i::normal (CORBA::Long arg + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg)); } void -Visual_i::nothing (CORBA::Environment &) +Visual_i::nothing (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (CORBA::Environment &ACE_TRY_ENV) +Visual_i::user (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)) { @@ -37,7 +37,7 @@ Visual_i::user (CORBA::Environment &ACE_TRY_ENV) } void -Visual_i::system (CORBA::Environment &ACE_TRY_ENV) +Visual_i::system (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,9 +45,9 @@ Visual_i::system (CORBA::Environment &ACE_TRY_ENV) } void -Visual_i::shutdown (CORBA::Environment &ACE_TRY_ENV) +Visual_i::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); ACE_CHECK; } 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 2f41cee3958..7fc612e7210 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h @@ -28,26 +28,21 @@ public: Visual_i (CORBA::ORB_ptr orb); - void normal (CORBA::Long arg, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + void normal (CORBA::Long arg + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void nothing (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + void nothing (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + void user (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - void system (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + void system (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: |