From 2ee7b7eed4c0cc10f4ec25b186b04202af01b565 Mon Sep 17 00:00:00 2001 From: elliott_c Date: Thu, 25 Jan 2007 18:17:52 +0000 Subject: ChangeLogTag: Thu Jan 25 17:39:59 UTC 2007 Chad Elliott --- .../Benchmark/Client_ORBInitializer.cpp | 9 +-- .../Benchmark/Client_ORBInitializer.h | 6 +- .../Benchmark/Server_ORBInitializer.cpp | 9 +-- .../Benchmark/Server_ORBInitializer.h | 6 +- .../Portable_Interceptors/Benchmark/client.cpp | 33 ++++----- .../Benchmark/client_interceptors.cpp | 79 +++++++------------- .../Benchmark/client_interceptors.h | 60 ++++++---------- .../Portable_Interceptors/Benchmark/server.cpp | 30 ++++---- .../Benchmark/server_interceptors.cpp | 83 ++++++++-------------- .../Benchmark/server_interceptors.h | 60 ++++++---------- .../Portable_Interceptors/Benchmark/test_i.cpp | 10 ++- TAO/tests/Portable_Interceptors/Benchmark/test_i.h | 6 +- 12 files changed, 137 insertions(+), 254 deletions(-) (limited to 'TAO/tests/Portable_Interceptors/Benchmark') diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index 841c4b7a76e..b982a6ee210 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -16,16 +16,14 @@ Client_ORBInitializer::Client_ORBInitializer (int interceptor_type) void Client_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Client_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -66,6 +64,5 @@ Client_ORBInitializer::post_init ( PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp; - info->add_client_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_client_request_interceptor (interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h index f26c625ffbe..1a0b10ba5cb 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Client_ORBInitializer (int interceptor_type); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp index d39ee932251..3b021b51eb8 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -18,16 +18,14 @@ Server_ORBInitializer::Server_ORBInitializer (int interceptor_type) void Server_ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ORBInitInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { } void Server_ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -68,6 +66,5 @@ Server_ORBInitializer::post_init ( PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp; - info->add_server_request_interceptor (interceptor.in () - ACE_ENV_ARG_PARAMETER); + info->add_server_request_interceptor (interceptor.in ()); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h index 599301a17d9..1907dcab0db 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.h @@ -31,12 +31,10 @@ public: /// Constructor Server_ORBInitializer (int interceptor_type); - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index e1b14bb4e51..bf51c2f3bf0 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -51,8 +51,7 @@ parse_args (int argc, char *argv[]) void -run_test (Test_Interceptors::Secure_Vault_ptr server - ACE_ENV_ARG_DECL) +run_test (Test_Interceptors::Secure_Vault_ptr server) { int i = 0; const char user[] = "root"; @@ -86,7 +85,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server marker.dump_stats ("Ready method ", gsf, 1); - ACE_TRY + try { marker.accumulate_into (throughput, 2); throughput_base = ACE_OS::gethrtime (); @@ -96,7 +95,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - server->authenticate (user ACE_ENV_ARG_PARAMETER); + server->authenticate (user); // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -111,11 +110,10 @@ run_test (Test_Interceptors::Secure_Vault_ptr server } marker.dump_stats ("Authenticate method ", gsf, 2); } - ACE_CATCH (Test_Interceptors::Invalid, userex) + catch (const Test_Interceptors::Invalid& userex) { ACE_DEBUG ((LM_DEBUG, "Invalid user\n")); } - ACE_ENDTRY; Test_Interceptors::Secure_Vault::Record record; record.check_num = 1; @@ -131,8 +129,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server ACE_hrtime_t latency_base = ACE_OS::gethrtime (); server->update_records (id, - record - ACE_ENV_ARG_PARAMETER); + record); // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -177,7 +174,7 @@ main (int argc, char *argv[]) int interceptor_type; get_interceptor_type (argc, argv, interceptor_type); - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -187,21 +184,19 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = - orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ior); Test_Interceptors::Secure_Vault_var server = - Test_Interceptors::Secure_Vault::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Secure_Vault::_narrow (object.in ()); if (CORBA::is_nil (server.in ())) { @@ -216,17 +211,15 @@ 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_ENV_ARG_PARAMETER); + run_test (server.in ()); server->shutdown (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index dd6919fcd4a..93ed136976e 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -38,8 +38,7 @@ Vault_Client_Request_Interceptor::destroy (void) void Vault_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -47,8 +46,7 @@ Vault_Client_Request_Interceptor::send_poll ( void Vault_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -71,7 +69,7 @@ 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_ENV_ARG_PARAMETER); + ri->add_request_service_context (sc, 0); } if (ACE_OS::strcmp (op.in (), "update_records") == 0) @@ -90,8 +88,7 @@ Vault_Client_Request_Interceptor::send_request ( void Vault_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -108,8 +105,7 @@ Vault_Client_Request_Interceptor::receive_reply ( void Vault_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -118,8 +114,7 @@ Vault_Client_Request_Interceptor::receive_other ( void Vault_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -153,24 +148,21 @@ Vault_Client_Request_Context_Interceptor::~Vault_Client_Request_Context_Intercep } char * -Vault_Client_Request_Context_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Context_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Client_Request_Context_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Context_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_Context_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -178,8 +170,7 @@ Vault_Client_Request_Context_Interceptor::send_poll ( void Vault_Client_Request_Context_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -200,13 +191,12 @@ 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_ENV_ARG_PARAMETER); + ri->add_request_service_context (sc, 0); } void Vault_Client_Request_Context_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -215,8 +205,7 @@ Vault_Client_Request_Context_Interceptor::receive_other ( void Vault_Client_Request_Context_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -224,8 +213,7 @@ Vault_Client_Request_Context_Interceptor::receive_reply ( void Vault_Client_Request_Context_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -259,24 +247,21 @@ Vault_Client_Request_Dynamic_Interceptor::~Vault_Client_Request_Dynamic_Intercep } char * -Vault_Client_Request_Dynamic_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Dynamic_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Client_Request_Dynamic_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Dynamic_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_Dynamic_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -284,8 +269,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_poll ( void Vault_Client_Request_Dynamic_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -319,8 +303,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( void Vault_Client_Request_Dynamic_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -347,8 +330,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( void Vault_Client_Request_Dynamic_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -357,8 +339,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_other ( void Vault_Client_Request_Dynamic_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -399,16 +380,14 @@ Vault_Client_Request_NOOP_Interceptor::name (void) } void -Vault_Client_Request_NOOP_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_NOOP_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Client_Request_NOOP_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -416,8 +395,7 @@ Vault_Client_Request_NOOP_Interceptor::send_poll ( void Vault_Client_Request_NOOP_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -426,8 +404,7 @@ Vault_Client_Request_NOOP_Interceptor::send_request ( void Vault_Client_Request_NOOP_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -436,8 +413,7 @@ Vault_Client_Request_NOOP_Interceptor::receive_other ( void Vault_Client_Request_NOOP_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -445,8 +421,7 @@ Vault_Client_Request_NOOP_Interceptor::receive_reply ( void Vault_Client_Request_NOOP_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h index 7fa620e29d5..bdc6760fe89 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h @@ -38,26 +38,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -83,26 +78,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -128,26 +118,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -173,26 +158,21 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp index 32cc8cdce8f..22878410b94 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -45,7 +45,7 @@ main (int argc, char *argv[]) int interceptor_type; get_interceptor_type (argc, argv, interceptor_type); - ACE_TRY_NEW_ENV + try { PortableInterceptor::ORBInitializer_ptr temp_initializer; @@ -55,24 +55,23 @@ main (int argc, char *argv[]) PortableInterceptor::ORBInitializer_var initializer = temp_initializer; - PortableInterceptor::register_orb_initializer (initializer.in () - ACE_ENV_ARG_PARAMETER); + PortableInterceptor::register_orb_initializer (initializer.in ()); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -82,19 +81,16 @@ main (int argc, char *argv[]) Secure_Vault_i server_impl (orb.in ()); PortableServer::ObjectId_var id = - root_poa->activate_object (&server_impl - ACE_ENV_ARG_PARAMETER); + root_poa->activate_object (&server_impl); CORBA::Object_var test_obj = - root_poa->id_to_reference (id.in () - ACE_ENV_ARG_PARAMETER); + root_poa->id_to_reference (id.in ()); Test_Interceptors::Secure_Vault_var server = - Test_Interceptors::Secure_Vault::_narrow (test_obj.in () - ACE_ENV_ARG_PARAMETER); + Test_Interceptors::Secure_Vault::_narrow (test_obj.in ()); CORBA::String_var ior = - orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (server.in ()); ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Secure_Vault: <%s>\n", @@ -117,15 +113,13 @@ main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); - root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + root_poa->destroy (1, 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index 8bb4a1e9aec..8cc0f504334 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -38,8 +38,7 @@ Vault_Server_Request_Interceptor::destroy (void) void Vault_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -48,8 +47,7 @@ Vault_Server_Request_Interceptor::receive_request_service_contexts ( void Vault_Server_Request_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -60,13 +58,13 @@ Vault_Server_Request_Interceptor::receive_request ( { IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (id); const char *buf = reinterpret_cast (sc->context_data.get_buffer ()); if (ACE_OS::strcmp (buf, "root123") != 0) - ACE_THROW (CORBA::NO_PERMISSION ()); + throw CORBA::NO_PERMISSION (); } if (ACE_OS::strcmp (op.in (), "update_records") == 0) @@ -85,8 +83,7 @@ Vault_Server_Request_Interceptor::receive_request ( void Vault_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -103,8 +100,7 @@ Vault_Server_Request_Interceptor::send_reply ( void Vault_Server_Request_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -113,8 +109,7 @@ Vault_Server_Request_Interceptor::send_exception ( void Vault_Server_Request_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -134,24 +129,21 @@ Vault_Server_Request_Context_Interceptor::~Vault_Server_Request_Context_Intercep } char * -Vault_Server_Request_Context_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Context_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Server_Request_Context_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Context_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_Context_Interceptor::receive_request_service_contexts( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -160,26 +152,24 @@ Vault_Server_Request_Context_Interceptor::receive_request_service_contexts( void Vault_Server_Request_Context_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = - ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); + ri->get_request_service_context (id); const char *buf = reinterpret_cast (sc->context_data.get_buffer ()); if (ACE_OS::strcmp (buf, "root123") !=0) - ACE_THROW (CORBA::NO_PERMISSION ()); + throw CORBA::NO_PERMISSION (); } void Vault_Server_Request_Context_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -187,8 +177,7 @@ Vault_Server_Request_Context_Interceptor::send_reply ( void Vault_Server_Request_Context_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -196,8 +185,7 @@ Vault_Server_Request_Context_Interceptor::send_exception ( void Vault_Server_Request_Context_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -216,24 +204,21 @@ Vault_Server_Request_Dynamic_Interceptor::~Vault_Server_Request_Dynamic_Intercep } char * -Vault_Server_Request_Dynamic_Interceptor::name ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Dynamic_Interceptor::name () ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Server_Request_Dynamic_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Dynamic_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_Dynamic_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -267,8 +252,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( void Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -277,8 +261,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts( void Vault_Server_Request_Dynamic_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -303,8 +286,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( void Vault_Server_Request_Dynamic_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -312,8 +294,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_exception ( void Vault_Server_Request_Dynamic_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -339,16 +320,14 @@ Vault_Server_Request_NOOP_Interceptor::name (void) } void -Vault_Server_Request_NOOP_Interceptor::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_NOOP_Interceptor::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { } void Vault_Server_Request_NOOP_Interceptor::receive_request ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -356,8 +335,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request ( void Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -366,8 +344,7 @@ Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts( void Vault_Server_Request_NOOP_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -375,8 +352,7 @@ Vault_Server_Request_NOOP_Interceptor::send_reply ( void Vault_Server_Request_NOOP_Interceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -384,8 +360,7 @@ Vault_Server_Request_NOOP_Interceptor::send_exception ( void Vault_Server_Request_NOOP_Interceptor::send_other ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h index 3f4c6cf9a3f..3d8481368d5 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h @@ -38,28 +38,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -85,28 +80,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -132,28 +122,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); @@ -179,28 +164,23 @@ public: virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index 486c503d03c..bc2945f2fed 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -20,20 +20,18 @@ Secure_Vault_i::ready (void) } void -Secure_Vault_i::authenticate (const char * user - ACE_ENV_ARG_DECL) +Secure_Vault_i::authenticate (const char * user) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Invalid)) { if (ACE_OS::strcmp (user, "root") != 0) - ACE_THROW (Test_Interceptors::Invalid ()); + throw Test_Interceptors::Invalid (); } CORBA::Long Secure_Vault_i::update_records (CORBA::Long, - const Test_Interceptors::Secure_Vault::Record & - ACE_ENV_ARG_DECL_NOT_USED) + const Test_Interceptors::Secure_Vault::Record &) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; @@ -43,5 +41,5 @@ void Secure_Vault_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index e6b182888f5..9516f9babe1 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -30,15 +30,13 @@ public: virtual CORBA::Short ready (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void authenticate (const char * user - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void authenticate (const char * user) 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 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const Test_Interceptors::Secure_Vault::Record & val) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void shutdown (void) -- cgit v1.2.1