diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Benchmark')
10 files changed, 63 insertions, 128 deletions
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp index 4cad9dde31b..841c4b7a76e 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Client_ORBInitializer.cpp @@ -63,11 +63,9 @@ Client_ORBInitializer::post_init ( break; } } - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var interceptor = tmp; info->add_client_request_interceptor (interceptor.in () ACE_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 5ab4c2336d5..d39ee932251 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/Server_ORBInitializer.cpp @@ -65,11 +65,9 @@ Server_ORBInitializer::post_init ( break; } } - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var interceptor = tmp; info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp index a874f7d3121..e1b14bb4e51 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp @@ -70,8 +70,7 @@ run_test (Test_Interceptors::Secure_Vault_ptr server // Record current time. ACE_hrtime_t latency_base = ACE_OS::gethrtime (); - server->ready (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->ready (); // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -81,7 +80,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server now - latency_base, 1); - ACE_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); } @@ -99,7 +97,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server ACE_hrtime_t latency_base = ACE_OS::gethrtime (); server->authenticate (user ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -119,7 +116,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server ACE_DEBUG ((LM_DEBUG, "Invalid user\n")); } ACE_ENDTRY; - ACE_CHECK; Test_Interceptors::Secure_Vault::Record record; record.check_num = 1; @@ -137,7 +133,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server server->update_records (id, record ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Grab timestamp again. ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -147,7 +142,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server now - latency_base, 3); - ACE_CHECK; if (TAO_debug_level > 0 && i % 100 == 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i)); @@ -195,23 +189,19 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Secure_Vault_var server = Test_Interceptors::Secure_Vault::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -227,10 +217,8 @@ main (int argc, char *argv[]) // the same method is intercepted by different interceptors // wanting to achieve different functionality. run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index 0086a292ed7..dd6919fcd4a 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -24,14 +24,14 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor () } char * -Vault_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -53,8 +53,7 @@ Vault_Client_Request_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { @@ -73,14 +72,12 @@ Vault_Client_Request_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test_Interceptors::Secure_Vault::Record *record; CORBA::Long id; @@ -98,14 +95,12 @@ Vault_Client_Request_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -129,17 +124,14 @@ Vault_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *id = tc->id (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); if (ACE_OS::strcmp (id, exception_id.in ()) != 0) ACE_ERROR ((LM_ERROR, @@ -202,7 +194,6 @@ Vault_Client_Request_Context_Interceptor::send_request ( ACE_NEW_THROW_EX (buf, CORBA::Octet [string_len], CORBA::NO_MEMORY ()); - ACE_CHECK; ACE_OS::strcpy (reinterpret_cast<char *> (buf), passwd); @@ -210,7 +201,6 @@ Vault_Client_Request_Context_Interceptor::send_request ( // Add this context to the service context list. ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } void @@ -240,17 +230,14 @@ Vault_Client_Request_Context_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *id = tc->id (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); if (ACE_OS::strcmp (id, exception_id.in ()) != 0) ACE_ERROR ((LM_ERROR, @@ -303,14 +290,12 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); const char *user; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -321,8 +306,7 @@ Vault_Client_Request_Dynamic_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test_Interceptors::Secure_Vault::Record *record; CORBA::Long id; @@ -340,15 +324,13 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "ready") == 0) { CORBA::Short result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -357,8 +339,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply ( { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -382,17 +363,14 @@ Vault_Client_Request_Dynamic_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *id = tc->id (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); if (ACE_OS::strcmp (id, exception_id.in ()) != 0) ACE_ERROR ((LM_ERROR, @@ -414,7 +392,7 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor () } char * -Vault_Client_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Client_Request_NOOP_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); @@ -473,17 +451,14 @@ Vault_Client_Request_NOOP_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::Any_var any = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var any = ri->received_exception (); CORBA::TypeCode_var tc = any->type (); - const char *id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *id = tc->id (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); if (ACE_OS::strcmp (id, exception_id.in ()) != 0) ACE_ERROR ((LM_ERROR, diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h index 75f8d621f40..7fa620e29d5 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h @@ -31,11 +31,11 @@ public: virtual ~Vault_Client_Request_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr @@ -76,11 +76,11 @@ public: virtual ~Vault_Client_Request_Context_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr @@ -121,11 +121,11 @@ public: virtual ~Vault_Client_Request_Dynamic_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr @@ -166,11 +166,11 @@ public: virtual ~Vault_Client_Request_NOOP_Interceptor (); // dtor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp index c556aed2940..32cc8cdce8f 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp @@ -57,18 +57,15 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_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_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), @@ -76,35 +73,28 @@ main (int argc, char *argv[]) PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); Secure_Vault_i server_impl (orb.in ()); PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var test_obj = root_poa->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Secure_Vault_var server = Test_Interceptors::Secure_Vault::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Secure_Vault: <%s>\n", @@ -123,13 +113,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index a11b66691d3..8bb4a1e9aec 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -24,14 +24,14 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor () } char * -Vault_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Vault_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -54,15 +54,13 @@ Vault_Server_Request_Interceptor::receive_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -74,8 +72,7 @@ Vault_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test_Interceptors::Secure_Vault::Record *record; CORBA::Long id; @@ -93,14 +90,12 @@ Vault_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "update_records") == 0) { CORBA::Long result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -174,7 +169,6 @@ Vault_Server_Request_Context_Interceptor::receive_request ( IOP::ServiceId id = request_ctx_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -244,14 +238,12 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "authenticate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); const char *user; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -262,8 +254,7 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "update_records") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test_Interceptors::Secure_Vault::Record *record; CORBA::Long id; @@ -291,14 +282,12 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "ready") == 0) { CORBA::Short result; - CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -306,8 +295,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_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var result_any = ri->result (); (result_any.in ()) >>= result; } @@ -344,7 +332,7 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor () } char * -Vault_Server_Request_NOOP_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Vault_Server_Request_NOOP_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h index 3adc2fe8424..3f4c6cf9a3f 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h @@ -31,11 +31,11 @@ public: ~Vault_Server_Request_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri @@ -78,11 +78,11 @@ public: ~Vault_Server_Request_Context_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri @@ -125,11 +125,11 @@ public: ~Vault_Server_Request_Dynamic_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri @@ -172,11 +172,11 @@ public: ~Vault_Server_Request_NOOP_Interceptor (); // dotr. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); // Canonical name of the interceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index f94c81f5efd..486c503d03c 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -13,7 +13,7 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb) // ctor CORBA::Short -Secure_Vault_i::ready (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Secure_Vault_i::ready (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return 1; @@ -40,7 +40,7 @@ return 1; } void -Secure_Vault_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Secure_Vault_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index 1e91333a22d..e6b182888f5 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -27,7 +27,7 @@ public: Secure_Vault_i (CORBA::ORB_ptr orb); // ctor - virtual CORBA::Short ready (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short ready (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void authenticate (const char * user @@ -41,7 +41,7 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: |