diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors')
168 files changed, 556 insertions, 1378 deletions
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp index ed90dd7815f..a3217d6afac 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp @@ -30,14 +30,14 @@ Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Echo_Client_Interceptor"); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -71,13 +71,11 @@ Echo_Client_Request_Interceptor::send_request ( ri->add_request_service_context (sc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Check that the request service context can be retrieved. IOP::ServiceContext_var rc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -101,7 +99,6 @@ Echo_Client_Request_Interceptor::receive_reply ( IOP::ServiceContext_var rc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -126,7 +123,6 @@ Echo_Client_Request_Interceptor::receive_other ( IOP::ServiceContext_var rc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h index f775ebe2052..0c529129019 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h @@ -25,11 +25,11 @@ public: static unsigned long other_count; static unsigned long exception_count; - 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/AMI/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp index 46ecb32ca03..533658d299d 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_ORBInitializer.cpp @@ -34,5 +34,4 @@ Client_ORBInitializer::post_init ( info->add_client_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp index 677ebee90b9..4a33052b676 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp @@ -23,7 +23,7 @@ Echo::echo_operation(char const * the_input } void -Echo::shutdown(ACE_ENV_SINGLE_ARG_DECL) +Echo::shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)) { this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER); diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h index de20793bbde..4a8b656ee82 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h @@ -20,7 +20,7 @@ public: virtual char * echo_operation(char const * the_input ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp index 3dc6be77b96..88bd3501fc2 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp @@ -34,7 +34,7 @@ Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder * } void -Echo_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Handler::shutdown (void) ACE_THROW_SPEC((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h index 76517aa76f2..c3860e22125 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h @@ -23,7 +23,7 @@ public: virtual void echo_operation_excep(::Messaging::ExceptionHolder * h ACE_ENV_ARG_DECL) ACE_THROW_SPEC((CORBA::SystemException)); - virtual void shutdown(ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown(void) ACE_THROW_SPEC((CORBA::SystemException)); virtual void shutdown_excep(::Messaging::ExceptionHolder * h ACE_ENV_ARG_DECL) diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp index 4e8e110e4cd..923d6db7f04 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp @@ -22,14 +22,14 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Echo_Server_Interceptor"); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -42,8 +42,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); if (ACE_OS::strcmp ("_is_a", operation.in ()) == 0) return; @@ -51,7 +50,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_id; IOP::ServiceContext_var sc = ri->get_request_service_context (id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (sc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h index 6ccb824bc8a..1b81b12e20c 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h @@ -20,10 +20,10 @@ class Echo_Server_Request_Interceptor public: Echo_Server_Request_Interceptor (); - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - 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/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp index dc409dd644e..6d8e323a9b8 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp @@ -36,5 +36,4 @@ Server_ORBInitializer::post_init ( info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp index 571ccf476a0..4d4f046509d 100644 --- a/TAO/tests/Portable_Interceptors/AMI/client.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp @@ -59,12 +59,10 @@ main (int argc, char *argv[]) new Client_ORBInitializer); 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; @@ -72,12 +70,10 @@ main (int argc, char *argv[]) CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -85,19 +81,15 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::Object_var tmp = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test::Echo_var echo = Test::Echo::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); if (CORBA::is_nil (echo.in ())) { @@ -109,18 +101,14 @@ main (int argc, char *argv[]) test_synchronous (echo.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_ami (orb.in (), echo.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - echo->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + echo->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); unsigned long request_count = Echo_Client_Request_Interceptor::request_count; @@ -174,7 +162,6 @@ test_synchronous (Test::Echo_ptr echo CORBA::String_var s = echo->echo_operation ("dummy message" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } unsigned long total_request_count = @@ -216,8 +203,7 @@ test_ami (CORBA::ORB_ptr orb, PortableServer::ServantBase_var safe_echo_handler = echo_handler_impl; echo_handler = - echo_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + echo_handler_impl->_this (); unsigned long initial_request_count = Echo_Client_Request_Interceptor::request_count; @@ -230,7 +216,6 @@ test_ami (CORBA::ORB_ptr orb, echo_handler.in (), "dummy message" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } unsigned long total_request_count = @@ -256,13 +241,11 @@ test_ami (CORBA::ORB_ptr orb, while (echo_handler_impl->replies () != ITERATIONS) { CORBA::Boolean pending = - orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb->work_pending (); if (pending) { - orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + orb->perform_work (); } } @@ -291,7 +274,6 @@ wait_for_exception (CORBA::ORB_ptr orb, { ACE_Time_Value tv (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; bool exception_detected = false; @@ -302,7 +284,6 @@ wait_for_exception (CORBA::ORB_ptr orb, CORBA::String_var dummy = echo->echo_operation ("foo" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -313,7 +294,6 @@ wait_for_exception (CORBA::ORB_ptr orb, tv = ACE_Time_Value (1, 0); orb->run (tv ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif /*if 0*/ diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp index 0c52ac89b18..9d32157f46e 100644 --- a/TAO/tests/Portable_Interceptors/AMI/server.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp @@ -50,20 +50,16 @@ main (int argc, char *argv[]) new Server_ORBInitializer); 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; CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -71,8 +67,7 @@ main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); if (parse_args (argc, argv) != 0) return 1; @@ -84,12 +79,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer(echo_impl); Test::Echo_var echo = - echo_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + echo_impl->_this (); CORBA::String_var ior = orb->object_to_string (echo.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Output the IOR to the <ior_output_file> FILE *output_file = ACE_OS::fopen (ior_output_file, "w"); @@ -101,19 +94,15 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp index 1a1256f6ad7..2e1f0fc57dc 100644 --- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp +++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp @@ -124,7 +124,7 @@ public: virtual void send_reply (ServerRequestInfo_ptr ri) throw (SystemException) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var op = ri->operation (); if (ACE_OS::strcmp (op.in (), "number") != 0) return; // Don't mess with PICurrent if not invoking test method. 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: diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp index fd053e810f0..4ce9d465ca0 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp @@ -28,8 +28,7 @@ Client_ORBInitializer::post_init ( { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); PortableInterceptor::ClientRequestInterceptor_ptr interceptor = PortableInterceptor::ClientRequestInterceptor::_nil (); @@ -38,13 +37,11 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (orb_id.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp index b5590a28f3b..030ab3b4969 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp @@ -31,14 +31,12 @@ Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (this->server_interceptor_, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp index 09231faacf2..f834c28a8f0 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp @@ -41,30 +41,26 @@ run_test (Test_Interceptors::Visual_ptr server { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); - server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->nothing (); ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n")); ACE_TRY { - server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -72,7 +68,6 @@ run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } int @@ -90,22 +85,18 @@ 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::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -116,10 +107,8 @@ main (int argc, char *argv[]) } 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/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp index a9ea659b832..01b87c1d099 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp @@ -29,14 +29,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -63,20 +63,16 @@ Echo_Client_Request_Interceptor::send_request ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.send_request " @@ -90,7 +86,6 @@ Echo_Client_Request_Interceptor::send_request ( ACE_TRY_NEW_ENV { ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::BAD_PARAM, error) { @@ -121,12 +116,10 @@ Echo_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; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -162,12 +155,10 @@ 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_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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -201,20 +192,16 @@ Echo_Client_Request_Interceptor::receive_reply ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.receive_reply from " @@ -227,7 +214,6 @@ Echo_Client_Request_Interceptor::receive_reply ( // expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -245,7 +231,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -276,15 +261,12 @@ Echo_Client_Request_Interceptor::receive_other ( this->orb_id_.in ()); } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.receive_other from " @@ -296,7 +278,6 @@ Echo_Client_Request_Interceptor::receive_other ( // Check that no one has messed with the request service context. IOP::ServiceContext_var sc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -325,18 +306,14 @@ Echo_Client_Request_Interceptor::receive_exception ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.received_exception " @@ -349,7 +326,6 @@ Echo_Client_Request_Interceptor::receive_exception ( // expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -367,7 +343,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h index 2503a4b75b7..5ee9a220c42 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_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 diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp index 35f0c3ada75..7ff16a1cdaa 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp @@ -52,16 +52,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now we can create the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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, @@ -70,14 +67,11 @@ 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 (); if (parse_args (argc, argv) != 0) return 1; @@ -87,7 +81,6 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var id = root_poa->activate_object (&server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create a second object to receive forwarded requests Visual_i forward_server_impl (orb.in ()); @@ -95,12 +88,10 @@ main (int argc, char *argv[]) PortableServer::ObjectId_var forward_id = root_poa->activate_object (&forward_server_impl ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var forward_test_obj = root_poa->id_to_reference (forward_id.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Echo_Server_Request_Interceptor * server_interceptor = temp_initializer->server_interceptor (); @@ -113,21 +104,17 @@ main (int argc, char *argv[]) server_interceptor->forward_reference (forward_test_obj.in () 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::Visual_var server = Test_Interceptors::Visual::_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::Visual: <%s>\n", @@ -146,13 +133,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/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp index 7739e548ed1..ffb42ec8d1c 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp @@ -47,14 +47,14 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -67,8 +67,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.receive_request_service_contexts from " @@ -86,7 +85,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_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 ()); @@ -114,7 +112,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // Add this context to the service context list. ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { @@ -144,8 +141,7 @@ Echo_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.send_reply from \"%s\"\n", @@ -155,7 +151,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -173,7 +168,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -196,8 +190,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.send_exception from \"%s\"\n", @@ -207,7 +200,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -225,7 +217,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -247,8 +238,7 @@ Echo_Server_Request_Interceptor::send_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.send_other from \"%s\"\n", @@ -258,7 +248,6 @@ Echo_Server_Request_Interceptor::send_other ( // Check that the request service context hasn't been changed. IOP::ServiceContext_var sc = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -278,8 +267,7 @@ Echo_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_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) ACE_THROW (CORBA::INTERNAL ()); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h index 81924ce2902..f23ef1915ca 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h @@ -37,11 +37,11 @@ public: ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - 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/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp index 503c7a5b423..a7839f0a2cd 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp @@ -21,14 +21,14 @@ Visual_i::normal (CORBA::Long arg } void -Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)) { @@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,9 +45,8 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h index 5a6df58c457..fbe117ea5d2 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h @@ -32,17 +32,17 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp index 2b3ff3f6fbb..9fd546f0552 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp @@ -31,15 +31,12 @@ main (int argc, char *argv[]) { PortableInterceptor::register_orb_initializer (initializer_var1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableInterceptor::register_orb_initializer (initializer_var2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::NO_MEMORY, ex) diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp index acceb91568b..5d8a1d77a55 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp @@ -35,14 +35,12 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_UNUSED_ARG (slot_id); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp index db5aab77b1d..87b8b09a27f 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp @@ -36,14 +36,12 @@ Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (this->server_interceptor_, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var interceptor = this->server_interceptor_; info->add_server_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } Echo_Server_Request_Interceptor * diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp index b95896c27ad..cd8cbf79b2e 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client.cpp @@ -43,15 +43,13 @@ static ACE_THR_FUNC_RETURN run_test(void* pData) ACE_TRY { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ex, "Exception thrown in run_test()\n"); } ACE_ENDTRY; - ACE_CHECK; - + return (ACE_THR_FUNC_RETURN)0; } @@ -70,22 +68,18 @@ 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::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -97,7 +91,7 @@ main (int argc, char *argv[]) ACE_hthread_t threadHandle; if ( ACE_Thread::spawn( run_test, - static_cast<void*>(server.in()), + static_cast<void*>(server.in()), THR_NEW_LWP | THR_JOINABLE , 0, & threadHandle @@ -107,10 +101,8 @@ main (int argc, char *argv[]) } ACE_Thread::join (threadHandle); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY @@ -119,7 +111,7 @@ main (int argc, char *argv[]) "Caught exception in client:"); return 1; } - + ACE_ENDTRY; return 0; diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp index b4f1e4e37cb..a1e13028d77 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -53,12 +53,10 @@ Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.send_request from %s\n", this->myname_, operation.in ())); @@ -74,7 +72,6 @@ Echo_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; } void @@ -84,12 +81,10 @@ Echo_Client_Request_Interceptor::receive_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_reply from %s\n", this->myname_, operation.in ())); } @@ -101,11 +96,9 @@ Echo_Client_Request_Interceptor::receive_other ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_other from %s\n", this->myname_, operation.in ())); } @@ -117,11 +110,9 @@ Echo_Client_Request_Interceptor::receive_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); ACE_DEBUG ((LM_DEBUG,"%s.receive_exception from %s\n", this->myname_, operation.in ())); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h index 95c3e21346f..d1a4ed1b491 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_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 diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp index 74e0c0a7227..93ebd9098d9 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server.cpp @@ -55,11 +55,9 @@ main (int argc, char *argv[]) // Now create an ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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, @@ -68,14 +66,11 @@ 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 (); if (parse_args (argc, argv) != 0) return 1; @@ -85,21 +80,17 @@ main (int argc, char *argv[]) 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::Visual_var server = Test_Interceptors::Visual::_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::Visual: <%s>\n", @@ -118,13 +109,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/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp index 60b8e2eb1d2..1edf05d2a24 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -20,14 +20,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,8 +40,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.receive_request_service_contexts from " @@ -57,7 +56,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_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 ()); @@ -82,7 +80,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( { ri->set_slot (slotId, data); ACE_DEBUG ((LM_DEBUG, "receive_request_service_contexts filled Slot %d\n",(int)slotId)); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -90,7 +87,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; } } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h index f6af5ee88c2..938dfc12486 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h @@ -31,11 +31,11 @@ public: ~Echo_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 diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp index 2686a6bfa70..1dd810a18be 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -26,8 +26,8 @@ Visual_i::normal (CORBA::Long arg CORBA::Object_var piobj = orb_->resolve_initial_references ("PICurrent"); PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (piobj.in () ); - - if (CORBA::is_nil (pi_current.in ())) + + if (CORBA::is_nil (pi_current.in ())) { ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : Unable to obtain PICurrent reference\n")); throw CORBA::INTERNAL(); @@ -44,10 +44,9 @@ Visual_i::normal (CORBA::Long arg throw; } ACE_ENDTRY; - ACE_CHECK; const char *str = 0; - if (! (retrieved_any.in() >>= str) ) + if (! (retrieved_any.in() >>= str) ) { ACE_DEBUG ((LM_DEBUG, "Visual_i::normal : Problem extracting data from CORBA::Any\n")); throw CORBA::INTERNAL(); @@ -59,9 +58,8 @@ Visual_i::normal (CORBA::Long arg } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h index bda46fa2346..14457ef6443 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h @@ -31,7 +31,7 @@ public: void normal (CORBA::Long arg ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp index aa829e678f1..f0cd31d306f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp @@ -26,11 +26,9 @@ Client_Task::svc (void) CORBA::Object_var object = corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -41,10 +39,8 @@ Client_Task::svc (void) } 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 { @@ -64,29 +60,25 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_ENV_ARG_DECL) { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Long one = 1, two = 1; (void) server->calculate (one, two ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -94,5 +86,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp index 1aaceae2c8c..42262eb0f72 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp @@ -62,7 +62,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = @@ -70,7 +69,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -94,7 +92,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), @@ -109,8 +106,7 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); CORBA::ULong number_called = Echo_Server_Request_Interceptor::server_interceptor_check_; diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp index 879b3549b22..bb9107f608d 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Echo_Collocated_ORBInitializer.cpp @@ -22,8 +22,7 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); if (!ACE_OS::strcmp (orb_id.in (), "client_orb")) { @@ -34,14 +33,12 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else if (!ACE_OS::strcmp (orb_id.in (), "server_orb")) { @@ -52,14 +49,12 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index a9db6a71b8a..32cca3aa9dc 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp @@ -31,7 +31,6 @@ Server_Task::svc (void) CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -40,14 +39,11 @@ Server_Task::svc (void) 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 (); Visual_i * server_impl = 0; ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); @@ -55,21 +51,17 @@ Server_Task::svc (void) 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::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -89,13 +81,11 @@ Server_Task::svc (void) // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->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/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 907a3e1193f..e60a822c7a6 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -26,14 +26,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -58,8 +58,7 @@ Echo_Client_Request_Interceptor::send_request ( client_interceptor_check_++; CORBA::String_var op = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -75,8 +74,7 @@ Echo_Client_Request_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -100,8 +98,7 @@ Echo_Client_Request_Interceptor::receive_other ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -119,8 +116,7 @@ Echo_Client_Request_Interceptor::receive_reply ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -132,8 +128,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -144,8 +139,7 @@ Echo_Client_Request_Interceptor::receive_reply ( else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -153,8 +147,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - 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; @@ -177,12 +170,10 @@ Echo_Client_Request_Interceptor::receive_exception ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " @@ -204,14 +195,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -234,12 +225,10 @@ Echo_Server_Request_Interceptor::receive_request ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); PortableInterceptor::ObjectId_var test_oid = - ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->object_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", @@ -248,8 +237,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -263,8 +251,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %s\n", @@ -279,8 +266,7 @@ Echo_Server_Request_Interceptor::send_reply ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", @@ -289,8 +275,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -304,8 +289,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -313,8 +297,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - 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; @@ -335,8 +318,7 @@ Echo_Server_Request_Interceptor::send_exception ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " @@ -345,13 +327,11 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h index 244270d4a37..133ed9e49be 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h @@ -33,11 +33,11 @@ public: virtual ~Echo_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 ( @@ -86,11 +86,11 @@ public: ~Echo_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_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp index 949bea21eb6..38c49820914 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp @@ -30,7 +30,7 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); @@ -38,7 +38,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -46,11 +46,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h index f31756fb10a..ab24946aa27 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h @@ -37,13 +37,13 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp index c068138c6b8..c1459691f7f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp @@ -24,11 +24,9 @@ Client_Task::svc (void) { CORBA::Object_var obj = this->corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -39,13 +37,10 @@ Client_Task::svc (void) } run_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); this->corb_->destroy(); - ACE_TRY_CHECK; } ACE_CATCHANY { @@ -63,27 +58,23 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_ENV_ARG_DECL) { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->nothing (); ACE_TRY { - server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -91,5 +82,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp index b53c358a387..10431febe8b 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp @@ -24,8 +24,7 @@ Collocated_ORBInitializer::post_init ( { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); if (!ACE_OS::strcmp (orb_id.in (), "client_orb")) { @@ -36,14 +35,12 @@ Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (orb_id.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else if (!ACE_OS::strcmp (orb_id.in (), "server_orb")) @@ -55,14 +52,12 @@ Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } else diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp index 27644baab31..51d75958ed9 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp @@ -63,7 +63,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter satc (argc, argv); @@ -72,7 +71,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; @@ -97,7 +95,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp index e25f9e30637..68a1d93a219 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp @@ -25,12 +25,10 @@ Server_Task::svc (void) CORBA::Object_var poa_object = this->sorb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -38,11 +36,9 @@ Server_Task::svc (void) 1); 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 (); Visual_i *vi = 0; ACE_NEW_RETURN (vi, Visual_i (sorb_.in ()), 1); @@ -51,21 +47,17 @@ Server_Task::svc (void) PortableServer::ObjectId_var id = root_poa->activate_object (server_impl.in() 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::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it if (output_ != 0) @@ -83,18 +75,15 @@ Server_Task::svc (void) // Signal the main thread before we call orb->run (); this->me_.signal (); - sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb_->run (); struct timespec ts = {0,250000000}; // quarter second ACE_OS::nanosleep (&ts); ACE_DEBUG ((LM_DEBUG, "(%P|%t) server task - event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp index 58260168b5e..d0d5cbf3137 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp @@ -25,14 +25,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -60,19 +60,15 @@ Echo_Client_Request_Interceptor::send_request ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.send_request " @@ -94,12 +90,10 @@ Echo_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; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -129,20 +123,16 @@ Echo_Client_Request_Interceptor::receive_reply ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::String_var operation = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); CORBA::Object_var target = - ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.receive_reply from " @@ -157,7 +147,6 @@ Echo_Client_Request_Interceptor::receive_reply ( IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -176,7 +165,6 @@ Echo_Client_Request_Interceptor::receive_reply ( IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -196,7 +184,6 @@ Echo_Client_Request_Interceptor::receive_reply ( "ERROR: Service Context Error \n")); } ACE_ENDTRY; - ACE_CHECK; } void @@ -224,18 +211,14 @@ Echo_Client_Request_Interceptor::receive_exception ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s.received_exception " @@ -250,7 +233,6 @@ Echo_Client_Request_Interceptor::receive_exception ( IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -269,7 +251,6 @@ Echo_Client_Request_Interceptor::receive_exception ( IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -289,7 +270,6 @@ Echo_Client_Request_Interceptor::receive_exception ( "ERROR: Service Context Error \n")); } ACE_ENDTRY; - ACE_CHECK; } Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) @@ -303,14 +283,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -322,8 +302,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "(%P|%t)%s.receive_request_service_contexts from " @@ -334,7 +313,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_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 ()); @@ -364,7 +342,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // Add this context to the service context list. ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -385,8 +362,7 @@ Echo_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "(%P|%t)%s.send_reply from \"%s\"\n", @@ -396,7 +372,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -414,7 +389,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -437,8 +411,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "(%P|%t)%s.send_exception from \"%s\"\n", @@ -448,7 +421,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); ACE_DEBUG ((LM_DEBUG, @@ -466,7 +438,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h index 29904bf2b55..961ce20f095 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h @@ -30,11 +30,11 @@ public: virtual ~Echo_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 @@ -82,11 +82,11 @@ public: ~Echo_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 diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp index 0b76048e39b..deeae26c4eb 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp @@ -21,14 +21,14 @@ Visual_i::normal (CORBA::Long } void -Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)) { @@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,12 +45,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - // this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - // ACE_CHECK; + // this->_remove_ref (); ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n")); this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h index 76a767d6a6a..8859d26f954 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h @@ -30,17 +30,17 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) 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 e67eb2afb3c..2f92cf250c0 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -32,14 +32,12 @@ Echo_Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index cdb8f91338e..dfec81cec41 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -32,14 +32,12 @@ Echo_Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index c3d906faeb3..68a5a30416e 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -48,21 +48,18 @@ run_test (Test_Interceptors::Visual_ptr server server->normal (10, msg.out () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Long one = 1, two = 1, result = 0; result = server->calculate (one, two ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "calculate() result = %d\n", result)); Test_Interceptors::Visual::VarLenStruct_var v = - server->the_structure (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->the_structure (); ACE_DEBUG ((LM_DEBUG, "the_structure() result is:\n" @@ -73,19 +70,17 @@ run_test (Test_Interceptors::Visual_ptr server ACE_TRY { - server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -93,7 +88,6 @@ run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } int @@ -113,23 +107,19 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ 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::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -141,8 +131,7 @@ main (int argc, char *argv[]) run_test (server.in () ACE_ENV_ARG_PARAMETER); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index 40b8274fa4e..88b6fe3dba5 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -54,8 +54,7 @@ Echo_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 (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::send_request from " @@ -67,8 +66,7 @@ Echo_Client_Request_Interceptor::send_request ( "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); if (paramlist->length () != 2) { @@ -108,8 +106,7 @@ Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_other " @@ -124,8 +121,7 @@ Echo_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 (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_reply " @@ -137,8 +133,7 @@ Echo_Client_Request_Interceptor::receive_reply ( "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); if (paramlist->length () != 2) { @@ -187,8 +182,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -196,8 +190,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - 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; @@ -210,8 +203,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "_get_the_structure") == 0) { - CORBA::Any_var a = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Any_var a = ri->result (); Test_Interceptors::Visual::VarLenStruct * v; @@ -234,8 +226,7 @@ Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " @@ -244,8 +235,7 @@ Echo_Client_Request_Interceptor::receive_exception ( CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h index d2de8b3455a..b351476113d 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h @@ -28,11 +28,11 @@ public: Echo_Client_Request_Interceptor (void); // ctor. - 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 ( diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 2197bc560bb..7d2035f72e5 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -55,16 +55,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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, @@ -73,14 +70,11 @@ 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 (); if (parse_args (argc, argv) != 0) return 1; @@ -90,21 +84,17 @@ main (int argc, char *argv[]) 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::Visual_var server = Test_Interceptors::Visual::_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::Visual: <%s>\n", ior.in ())); @@ -121,13 +111,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/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 3e1cf79ca24..232d5be21c4 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -53,8 +53,7 @@ Echo_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 (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", @@ -63,8 +62,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -78,8 +76,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %s\n", @@ -93,8 +90,7 @@ Echo_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 (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", @@ -103,8 +99,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -118,8 +113,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -127,8 +121,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - 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; @@ -148,8 +141,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " @@ -158,13 +150,11 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h index f536de965c0..d838e0abcd8 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h @@ -27,11 +27,11 @@ public: Echo_Server_Request_Interceptor (void); // cotr. - 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_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index 80c51203166..5abcc564b62 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -33,7 +33,7 @@ Visual_i::calculate (CORBA::Long one, } Test_Interceptors::Visual::VarLenStruct * -Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::the_structure (void) ACE_THROW_SPEC ((CORBA::SystemException)) { Test_Interceptors::Visual::VarLenStruct * s; @@ -41,7 +41,6 @@ Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL) ACE_NEW_THROW_EX (s, Test_Interceptors::Visual::VarLenStruct, CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (0); Test_Interceptors::Visual::VarLenStruct_var safe_s = s; @@ -52,7 +51,7 @@ Visual_i::the_structure (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); @@ -60,7 +59,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -68,7 +67,7 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::shutdown (void) 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 b174c34a422..b1cb9244297 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -35,13 +35,13 @@ public: ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void user (ACE_ENV_SINGLE_ARG_DECL) + virtual void user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - virtual void system (ACE_ENV_SINGLE_ARG_DECL) + virtual void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) + virtual void shutdown (void) 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 4845a04bed7..812695fba5f 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp @@ -28,11 +28,9 @@ Client_ORBInitializer::post_init ( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var orb_id = info->orb_id (); - CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::StringSeq_var args = info->arguments (); CORBA::String_var forward_str; @@ -55,14 +53,12 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp index 949746c9d36..b2ab0ceba8c 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -28,7 +28,7 @@ Client_Request_Interceptor::name ( } void -Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -43,8 +43,7 @@ Client_Request_Interceptor::send_request ( ++this->request_count_; CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) // A one-way request. return; @@ -61,18 +60,15 @@ Client_Request_Interceptor::send_request ( 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } CORBA::Object_var forward = this->orb_->string_to_object (this->forward_str_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::String_var forward_str = this->orb_->object_to_string (forward.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "CLIENT (%P|%t) Request %d will be forwarded " @@ -119,16 +115,14 @@ Client_Request_Interceptor::receive_other ( { CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); // Oneway if (!response_expected) return; PortableInterceptor::ReplyStatus reply_status = - ri->reply_status (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->reply_status (); if (reply_status == PortableInterceptor::TRANSPORT_RETRY) return; @@ -140,8 +134,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_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) ACE_THROW (CORBA::INTERNAL ()); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h index b39c5ae1297..f285ebbb668 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h @@ -65,10 +65,10 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp index af8304f1cbb..cb1393d02a5 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp @@ -40,13 +40,11 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; this->server_interceptor_ = interceptor; info->add_server_request_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } PortableInterceptor::ServerRequestInterceptor_ptr diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp index 10ad41353cf..0ad95fa4a28 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -40,14 +40,14 @@ Server_Request_Interceptor::forward_references ( } char * -Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::release (this->obj_[0]); @@ -64,8 +64,7 @@ Server_Request_Interceptor::receive_request_service_contexts ( this->request_count_++; CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) // A one-way request. return; @@ -99,8 +98,7 @@ Server_Request_Interceptor::receive_request ( PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) // A one-way request. return; @@ -155,8 +153,7 @@ Server_Request_Interceptor::send_other ( PortableInterceptor::ForwardRequest)) { CORBA::Boolean response_expected = - ri->response_expected (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->response_expected (); if (!response_expected) // A one-way request. return; @@ -167,8 +164,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_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var forward = ri->forward_reference (); if (CORBA::is_nil (forward.in ())) ACE_THROW (CORBA::INTERNAL ()); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h index 382097c50a0..46264e65e30 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h @@ -79,10 +79,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp index c04cfbaf890..111fed0e3c4 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp @@ -67,14 +67,12 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; @@ -84,11 +82,9 @@ main (int argc, char *argv[]) // this test. CORBA::Object_var object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ForwardRequestTest::test_var server = ForwardRequestTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -114,9 +110,8 @@ main (int argc, char *argv[]) if (i > 1) old_number = number; - number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER); + number = server->number (); - ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "CLIENT: Request %d handled by object %d.\n", @@ -143,8 +138,7 @@ main (int argc, char *argv[]) } } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp index 286a18b98c0..1864fcda68d 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp @@ -73,16 +73,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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, @@ -91,11 +88,9 @@ 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 (); if (::parse_args (argc, argv) != 0) return -1; @@ -110,21 +105,17 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid1 = first_poa->activate_object (&servant1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj1 = first_poa->servant_to_reference (&servant1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior1 = orb->object_to_string (obj1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 1: <%s>\n", @@ -138,28 +129,23 @@ main (int argc, char *argv[]) poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::ObjectId_var oid2 = second_poa->activate_object (&servant2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj2 = second_poa->servant_to_reference (&servant2 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior2 = orb->object_to_string (obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "ForwardRequestTest::test servant 2: <%s>\n", ior2.in ())); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); #if TAO_HAS_INTERCEPTORS == 1 // Set the forward references in the server request interceptor. @@ -169,7 +155,6 @@ main (int argc, char *argv[]) ForwardRequestTest::ServerRequestInterceptor_var interceptor = ForwardRequestTest::ServerRequestInterceptor::_narrow ( server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (interceptor.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -180,7 +165,6 @@ main (int argc, char *argv[]) interceptor->forward_references (obj1.in (), obj2.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ // Write each IOR to a file. @@ -207,14 +191,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); 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 adafe5be28d..122324ab774 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp @@ -18,14 +18,14 @@ test_i::~test_i (void) } CORBA::Short -test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::number (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h index 51c142c2de3..8b1d8091b62 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h @@ -37,11 +37,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short number (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) 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 2bf02d1ef30..6d44d1f9fa9 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -25,7 +25,7 @@ FOO_ClientRequestInterceptor::name ( } void -FOO_ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_ClientRequestInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -43,7 +43,6 @@ FOO_ClientRequestInterceptor::send_request ( IOP::TaggedComponent_var component = ri->get_effective_component (FOO::COMPONENT_ID ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // The correct tagged component appears to exist. Display the // contents of the component data, which should be a NULL terminated @@ -72,7 +71,6 @@ FOO_ClientRequestInterceptor::send_request ( this->codec_->decode_value (data, CORBA::_tc_string ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char * name = 0; diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h index abe9074a545..74b07c85d0f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -60,10 +60,10 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp index f999b2f22bb..b759201cbc9 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp @@ -24,8 +24,7 @@ FOO_Client_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::CodecFactory_var codec_factory = - info->codec_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->codec_factory (); // Set up a structure that contains information necessary to // create a GIOP 1.2 CDR encapsulation Codec. @@ -38,7 +37,6 @@ FOO_Client_ORBInitializer::post_init ( IOP::Codec_var codec = codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -48,12 +46,10 @@ FOO_Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var interceptor = foo; info->add_client_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp index c29013285ff..ebb1c1342cc 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp @@ -14,14 +14,14 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec) } char * -FOO_IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_IORInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("FOO_IORInterceptor"); } void -FOO_IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +FOO_IORInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -38,8 +38,7 @@ FOO_IORInterceptor::establish_components ( // does the right thing, and ignores any IOR interceptors that throw // an exception. - CORBA::String_var name = this->name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var name = this->name (); CORBA::Any data; data <<= name.in (); @@ -47,7 +46,6 @@ FOO_IORInterceptor::establish_components ( CORBA::OctetSeq_var encoded_data = this->codec_->encode_value (data ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Construct a tagged component. IOP::TaggedComponent component; @@ -69,7 +67,6 @@ FOO_IORInterceptor::establish_components ( // Add the tagged component to all profiles. info->add_ior_component (component ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Added tagged component containing the\n" @@ -81,7 +78,6 @@ FOO_IORInterceptor::establish_components ( info->add_ior_component_to_profile (component, IOP::TAG_INTERNET_IOP ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Added tagged component containing the\n" @@ -96,7 +92,6 @@ FOO_IORInterceptor::establish_components ( CORBA::Policy_var policy = info->get_effective_policy (PortableServer::THREAD_POLICY_ID ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Successfully retrieved effective policy.\n")); @@ -107,7 +102,6 @@ FOO_IORInterceptor::establish_components ( ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } void @@ -148,7 +142,6 @@ FOO_IORInterceptor::components_established ( } } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (PROFILE) { @@ -176,7 +169,6 @@ FOO_IORInterceptor::components_established ( } } ACE_ENDTRY; - ACE_CHECK; } void diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index 4fc980070d1..a7367fdaf18 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -59,11 +59,11 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp index 1930da1d6b0..9fe9a63e57c 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp @@ -25,8 +25,7 @@ FOO_IORInterceptor_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { IOP::CodecFactory_var codec_factory = - info->codec_factory (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->codec_factory (); // Set up a structure that contains information necessary to // create a GIOP 1.2 CDR encapsulation Codec. @@ -39,7 +38,6 @@ FOO_IORInterceptor_ORBInitializer::post_init ( IOP::Codec_var codec = codec_factory->create_codec (encoding ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::IORInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -49,12 +47,10 @@ FOO_IORInterceptor_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::IORInterceptor_var ior_interceptor = foo; info->add_ior_interceptor (ior_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp index a482b81963e..a20429818ac 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp @@ -54,23 +54,19 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FOO::test_var server = FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -80,8 +76,7 @@ main (int argc, char *argv[]) 1); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp index a91cf021548..d12fa9eb8a0 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp @@ -57,7 +57,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -65,16 +64,13 @@ main (int argc, char *argv[]) argv, "test_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -82,23 +78,19 @@ main (int argc, char *argv[]) -1); 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 (); if (parse_args (argc, argv) != 0) return -1; test_i server_impl (orb.in ()); - obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = server_impl._this (); FOO::test_var server = FOO::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -108,7 +100,6 @@ main (int argc, char *argv[]) CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "FOO::test: <%s>\n", ior.in ())); @@ -126,14 +117,12 @@ 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_INFO, "Event loop finished.\n")); // The interceptors will be destroyed when we call this - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index ecdb6b3560f..e966d06dfd9 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -12,7 +12,7 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index a712ff5c8d7..d21f3a0833f 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h @@ -34,7 +34,7 @@ public: test_i (CORBA::ORB_ptr orb); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp index 04262d84180..7d48da494f9 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp @@ -39,14 +39,12 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp index d7cd081e6d3..9b0bc3c203a 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp @@ -21,14 +21,14 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) } char * -Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->destroy_called_ = true; diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h index 10e3add572b..8989ac20ec8 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h @@ -60,10 +60,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp index ca70543c315..3cd19949ccb 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp @@ -48,7 +48,6 @@ main (int argc, char *argv[]) argv, "Client ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; @@ -56,11 +55,9 @@ main (int argc, char *argv[]) CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; test_var server = test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -70,11 +67,9 @@ main (int argc, char *argv[]) 1); } - server->hello (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->hello (); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp index 000fda92d76..4fa0a28f4eb 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp @@ -56,16 +56,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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, @@ -74,14 +71,11 @@ 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 (); if (::parse_args (argc, argv) != 0) return -1; @@ -89,13 +83,11 @@ main (int argc, char *argv[]) test_i servant (orb.in ()); CORBA::Object_var obj = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + servant._this (); CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "test servant: <%s>\n", @@ -113,14 +105,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_ASSERT (destroy_called == true); diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp index 8e96015a4c1..02d6b0dc13a 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp @@ -16,14 +16,14 @@ test_i::~test_i (void) } void -test_i::hello (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::hello (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Hello!\n")); } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h index 4ada828b0c2..f05d76ad2e1 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h @@ -36,11 +36,11 @@ public: ~test_i (void); /// Say hello. - virtual void hello (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void hello (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp index 425c916436e..f6d8025d7ea 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp @@ -32,12 +32,10 @@ ClientORBInitializer::post_init ( CORBA::Object_var obj = info->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (pi_current.in ())) { @@ -47,8 +45,7 @@ ClientORBInitializer::post_init ( ACE_THROW (CORBA::INTERNAL ()); } - ::slot_id = info->allocate_slot_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ::slot_id = info->allocate_slot_id (); PortableInterceptor::ClientRequestInterceptor_ptr foo; ACE_NEW_THROW_EX (foo, @@ -59,12 +56,10 @@ ClientORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var interceptor = foo; info->add_client_request_interceptor (interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp index 66a253f3074..a6e1556eb00 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp @@ -28,7 +28,7 @@ ClientRequestInterceptor::name ( } void -ClientRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ClientRequestInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,8 +40,7 @@ ClientRequestInterceptor::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, 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 (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. @@ -54,7 +53,6 @@ ClientRequestInterceptor::send_request ( CORBA::Any_var data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(data.in () >>= number)) { @@ -79,7 +77,6 @@ ClientRequestInterceptor::send_request ( this->pi_current_->set_slot (this->slot_id_, new_data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now retrieve the data from the RSC again. It should not have // changed! @@ -88,7 +85,6 @@ ClientRequestInterceptor::send_request ( CORBA::Any_var data2 = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(data2.in () >>= number2) || number != number2) @@ -114,7 +110,6 @@ ClientRequestInterceptor::send_request ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_INFO, "(%P|%t) Client side RSC/TSC semantics appear " diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h index c4709fff0a6..fe070a88325 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h @@ -60,10 +60,10 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp index 5eae8540505..32918295488 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp @@ -25,7 +25,7 @@ ClientRequestInterceptor2::name ( } void -ClientRequestInterceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ClientRequestInterceptor2::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -37,8 +37,7 @@ ClientRequestInterceptor2::send_request ( ACE_THROW_SPEC ((CORBA::SystemException, 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 (), "invoke_you") != 0) return; // Don't mess with PICurrent if not invoking test method. @@ -57,7 +56,6 @@ ClientRequestInterceptor2::send_request ( CORBA::Any_var data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (!(data.in () >>= number)) { @@ -86,7 +84,6 @@ ClientRequestInterceptor2::send_request ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_INFO, "(%P|%t) RSC->TSC->RSC copying appears to be working.\n")); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h index cfca53a52d6..1007a757f19 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h @@ -56,10 +56,10 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void send_request ( diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp index daa05dfb4ad..d05c9d84a28 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp @@ -29,12 +29,10 @@ ServerORBInitializer::post_init ( CORBA::Object_var obj = info->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil (pi_current.in ())) { @@ -44,8 +42,7 @@ ServerORBInitializer::post_init ( ACE_THROW (CORBA::INTERNAL ()); } - ::slot_id = info->allocate_slot_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ::slot_id = info->allocate_slot_id (); PortableInterceptor::ServerRequestInterceptor_ptr server_tmp; ACE_NEW_THROW_EX (server_tmp, @@ -56,14 +53,12 @@ ServerORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = server_tmp; info->add_server_request_interceptor (server_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_ptr client_tmp; ACE_NEW_THROW_EX (client_tmp, @@ -73,14 +68,12 @@ ServerORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = client_tmp; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Disable collocation -- TAO-specific!!! // @@ -91,7 +84,6 @@ ServerORBInitializer::post_init ( TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; tao_info->orb_core ()->optimize_collocation_objects (0); } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index a76d1d5b774..0a9ae728408 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -20,14 +20,14 @@ ServerRequestInterceptor::ServerRequestInterceptor ( } char * -ServerRequestInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void -ServerRequestInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +ServerRequestInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -40,8 +40,7 @@ ServerRequestInterceptor::receive_request_service_contexts ( 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 (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. @@ -56,7 +55,6 @@ ServerRequestInterceptor::receive_request_service_contexts ( data <<= number; ri->set_slot (this->slot_id_, data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) Inserted number <%d> into RSC.\n", @@ -75,7 +73,6 @@ ServerRequestInterceptor::receive_request_service_contexts ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; } void @@ -95,14 +92,12 @@ ServerRequestInterceptor::receive_request ( ri->set_slot (this->slot_id_, new_data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now retrieve the data from the TSC again. It should not have // changed to the new value CORBA::Any_var data2 = this->pi_current_->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Long number2 = 0; if ((data2.in () >>= number2) @@ -128,7 +123,6 @@ ServerRequestInterceptor::receive_request ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_INFO, "(%P|%t) Server side RSC/TSC semantics appear " @@ -143,8 +137,7 @@ ServerRequestInterceptor::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 (), "invoke_me") != 0) return; // Don't mess with PICurrent if not invoking test method. @@ -158,7 +151,6 @@ ServerRequestInterceptor::send_reply ( // stored into the RSC by the receive_request_service_contexts() // interception point. data = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The original data in the RSC was of type CORBA::Long. If the // following extraction from the CORBA::Any fails, then the @@ -193,14 +185,12 @@ ServerRequestInterceptor::send_reply ( this->pi_current_->set_slot (this->slot_id_, new_data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now retrieve the data from the RSC again. It should not have // changed! CORBA::Any_var data2 = ri->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; const char *str2 = 0; if (!(data2.in () >>= str2) @@ -226,7 +216,6 @@ ServerRequestInterceptor::send_reply ( ACE_TRY_THROW (CORBA::INTERNAL ()); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_INFO, "(%P|%t) Server side RSC/TSC semantics appear " diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h index b9cd7bf2c5d..73cd1a8156f 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h @@ -59,10 +59,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp index 2cd36a5cd9c..8ac95bdcd71 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp @@ -55,14 +55,12 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; @@ -71,12 +69,10 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (pi_current.in ())) { @@ -97,16 +93,13 @@ main (int argc, char *argv[]) pi_current->set_slot (::slot_id, data ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Resolve the target object, and perform the invocation. obj = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PICurrentTest::test_var server = PICurrentTest::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -138,13 +131,11 @@ main (int argc, char *argv[]) } } - server->invoke_me (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->invoke_me (); CORBA::Any_var new_data = pi_current->get_slot (::slot_id ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // The original data in the TSC was of type CORBA::Long. If the // following extraction from the CORBA::Any fails, then the @@ -166,15 +157,12 @@ main (int argc, char *argv[]) ACE_TRY_THROW (CORBA::INTERNAL ()); } - server->invoke_we (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->invoke_we (); - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); ACE_OS::sleep(1); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp index 46f5cde72a1..e73136104f3 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp @@ -60,22 +60,18 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "test_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -83,21 +79,17 @@ main (int argc, char *argv[]) -1); 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 (); if (parse_args (argc, argv) != 0) return -1; obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableInterceptor::Current_var pi_current = PortableInterceptor::Current::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (pi_current.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -108,13 +100,11 @@ main (int argc, char *argv[]) ::slot_id, orb.in ()); - obj = server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + obj = server_impl._this (); PICurrentTest::test_var server = PICurrentTest::test::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -124,7 +114,6 @@ main (int argc, char *argv[]) CORBA::String_var ior = orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "PICurrentTest::test: <%s>\n", ior.in ())); @@ -142,12 +131,10 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); ACE_OS::sleep(1); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); 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 453c16429aa..8de999831ae 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 (ACE_ENV_SINGLE_ARG_DECL) +test_i::invoke_me (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -44,8 +44,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) // By this point all of step 1 has occurred. Step 2 will now // occur. PICurrentTest::test_var my_ref = - this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_this (); // ---------------------------------------------------- @@ -59,7 +58,6 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) retrieved_any = this->current_->get_slot (this->slot_id_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::InvalidSlot, ex) { @@ -80,7 +78,6 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) "Unexpected exception\n"); } ACE_ENDTRY; - ACE_CHECK; CORBA::Long retrieved; if (retrieved_any.in() >>= retrieved) @@ -102,8 +99,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) // (ClientRequestInterceptor2) to be invoked. This assumes that // DIRECT collocation (and possibly THRU_POA collocation) is // disabled. - my_ref->invoke_you (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + my_ref->invoke_you (); // ---------------------------------------------------- @@ -135,7 +131,6 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY_THROW_EX (CORBA::INTERNAL (), foo); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) String \"%s\" inserted into TSC.\n", @@ -143,7 +138,7 @@ test_i::invoke_me (ACE_ENV_SINGLE_ARG_DECL) } void -test_i::invoke_you (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::invoke_you (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Nothing to be tested here. This method is here just so that we @@ -151,7 +146,7 @@ test_i::invoke_you (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) } void -test_i::invoke_we (ACE_ENV_SINGLE_ARG_DECL) +test_i::invoke_we (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // Insert some data into the TSC PICurrent object. @@ -182,7 +177,6 @@ test_i::invoke_we (ACE_ENV_SINGLE_ARG_DECL) ACE_TRY_THROW_EX (CORBA::INTERNAL (), foo); } ACE_ENDTRY; - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) String \"%s\" inserted into TSC.\n", @@ -190,7 +184,7 @@ test_i::invoke_we (ACE_ENV_SINGLE_ARG_DECL) } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index c9de94d10a0..02c15fffba3 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -41,21 +41,21 @@ public: ~test_i (void); /// Main servant test method. - virtual void invoke_me (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_me (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// No-op method used so that a client request interceptor will be /// invoked when invoking this method from the above invoke_me() /// method. Say that 10 times fast. :-) - virtual void invoke_you (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_you (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Test just a set slot - virtual void invoke_we (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void invoke_we (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp index 5c9cae1b492..135f9cdcab6 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp @@ -18,14 +18,14 @@ IORInterceptor::~IORInterceptor (void) } char * -IORInterceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +IORInterceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (""); } void -IORInterceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +IORInterceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ASSERT (this->success_); @@ -40,12 +40,10 @@ IORInterceptor::establish_components ( ACE_TRY { PortableInterceptor::ObjectReferenceTemplate_var t = - info->adapter_template (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + info->adapter_template (); PortableInterceptor::AdapterName_var a = - t->adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + t->adapter_name (); // Only execute if POA is not RootPOA. The RootPOA will not // have our custom policy, but the child POA we created will. @@ -54,12 +52,10 @@ IORInterceptor::establish_components ( CORBA::Policy_var policy ( info->get_effective_policy (Test::POLICY_TYPE ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; Test::Policy_var test_policy (Test::Policy::_narrow ( policy.in () ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; this->success_ = true; } @@ -73,6 +69,5 @@ IORInterceptor::establish_components ( ACE_ASSERT (false); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h index c2ab7cf6602..bec8aef5eec 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h @@ -58,11 +58,11 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the tagged components to the IOR. diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp index 5c9266495e9..f8838b1e9f4 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp @@ -19,34 +19,33 @@ Policy::~Policy (void) } CORBA::ULong -Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Policy::value (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::PolicyType -Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Policy::policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return Test::POLICY_TYPE; } CORBA::Policy_ptr -Policy::copy (ACE_ENV_SINGLE_ARG_DECL) +Policy::copy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::Policy_ptr p; ACE_NEW_THROW_EX (p, Policy (this->value_), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return p; } void -Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Policy::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h index 834e8918745..2843358dcbd 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h @@ -36,16 +36,16 @@ public: Policy (CORBA::ULong val); /// Test method defined in test IDL. - virtual CORBA::ULong value (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::ULong value (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::PolicyType policy_type (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Policy_ptr copy (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp index 495bc24a325..ba0fdfa6fb4 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp @@ -30,7 +30,6 @@ PolicyFactory::create_policy (CORBA::PolicyType type, ACE_NEW_THROW_EX (p, Policy (val), CORBA::NO_MEMORY ()); - ACE_CHECK_RETURN (CORBA::Policy::_nil ()); return p; } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp index e6369e699fa..0dc54c1a7ae 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp @@ -37,14 +37,12 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::PolicyFactory_var policy_factory (p); info->register_policy_factory (Test::POLICY_TYPE, policy_factory.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; PortableInterceptor::IORInterceptor_ptr i; ACE_NEW_THROW_EX (i, @@ -54,11 +52,9 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::IORInterceptor_var ior_interceptor (i); info->add_ior_interceptor (ior_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp index 1a52aa6b982..5dad3cfbb8e 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp @@ -29,13 +29,11 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "test_orb" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Create the test policy. @@ -46,11 +44,9 @@ main (int argc, char *argv[]) CORBA::Policy_var p (orb->create_policy (Test::POLICY_TYPE, any ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; const CORBA::PolicyType ptype = - p->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + p->policy_type (); // Sanity check. if (ptype != Test::POLICY_TYPE) @@ -58,10 +54,8 @@ main (int argc, char *argv[]) Test::Policy_var policy (Test::Policy::_narrow (p.in () ACE_ENV_ARG_PARAMETER)); - ACE_TRY_CHECK; - const CORBA::ULong pval = policy->value (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + const CORBA::ULong pval = policy->value (); // Sanity check. if (val != pval) @@ -70,12 +64,10 @@ main (int argc, char *argv[]) CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -83,33 +75,26 @@ main (int argc, char *argv[]) -1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + root_poa->the_POAManager (); CORBA::PolicyList policies (1); policies.length (1); - policies[0] = policy->copy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policies[0] = policy->copy (); PortableServer::POA_var poa = root_poa->create_POA ("Test POA", poa_manager.in (), policies ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + policy->destroy (); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_INFO, "\n" diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp index fca62b6fe50..d55a7d9e5c2 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp @@ -26,11 +26,9 @@ Client_Task::svc (void) CORBA::Object_var object = corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -41,10 +39,8 @@ Client_Task::svc (void) } 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 { @@ -64,29 +60,25 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_ENV_ARG_DECL) { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Long one = 1, two = 1; (void) server->calculate (one, two ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -94,5 +86,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp index 41d8c39fec7..fd0619dcc12 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp @@ -134,7 +134,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter satc (argc, argv); CORBA::ORB_var sorb = @@ -142,7 +141,6 @@ main (int argc, char *argv[]) satc.get_TCHAR_argv (), server_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, @@ -166,7 +164,6 @@ main (int argc, char *argv[]) catc.get_TCHAR_argv (), client_orb.c_str () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, corb.in (), @@ -181,8 +178,7 @@ main (int argc, char *argv[]) ACE_Thread_Manager::instance ()->wait (); - sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + sorb->destroy (); bool failed_check = false; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp index b9773fde351..d6923f750d4 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp @@ -31,32 +31,27 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); // TAO-Specific way to get to the ORB Core (and thus, the ORB). TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = PortableInterceptor::ORBInitInfo_3_1::_narrow(info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(info_3_1.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } if (!ACE_OS::strcmp (orb_id.in (), "client_orb")) @@ -68,7 +63,6 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; @@ -83,16 +77,13 @@ Echo_Collocated_ORBInitializer::post_init ( orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, client_proc_mode_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info_3_1->add_client_request_interceptor_with_policy ( client_interceptor.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); } else if (!ACE_OS::strcmp (orb_id.in (), "server_orb")) @@ -104,7 +95,6 @@ Echo_Collocated_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; @@ -119,16 +109,13 @@ Echo_Collocated_ORBInitializer::post_init ( orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, server_proc_mode_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info_3_1->add_server_request_interceptor_with_policy ( server_interceptor.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); } else diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp index a9db6a71b8a..32cca3aa9dc 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp @@ -31,7 +31,6 @@ Server_Task::svc (void) CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -40,14 +39,11 @@ Server_Task::svc (void) 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 (); Visual_i * server_impl = 0; ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); @@ -55,21 +51,17 @@ Server_Task::svc (void) 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::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -89,13 +81,11 @@ Server_Task::svc (void) // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->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/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp index 2082c0d81c9..20d48b0fba4 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp @@ -28,14 +28,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -58,8 +58,7 @@ Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ForwardRequest)) { CORBA::String_var op = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -78,8 +77,7 @@ Echo_Client_Request_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -100,8 +98,7 @@ Echo_Client_Request_Interceptor::receive_other ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -121,8 +118,7 @@ Echo_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 (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -138,8 +134,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -150,8 +145,7 @@ Echo_Client_Request_Interceptor::receive_reply ( else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -159,8 +153,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - 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; @@ -180,8 +173,7 @@ Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -190,8 +182,7 @@ Echo_Client_Request_Interceptor::receive_exception ( } CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " @@ -213,14 +204,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -242,8 +233,7 @@ Echo_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 (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -252,8 +242,7 @@ Echo_Server_Request_Interceptor::receive_request ( } PortableInterceptor::ObjectId_var test_oid = - ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->object_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", @@ -262,8 +251,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -277,8 +265,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %s\n", @@ -292,8 +279,7 @@ Echo_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 (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -308,8 +294,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -323,8 +308,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -332,8 +316,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - 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; @@ -353,8 +336,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); // Do not count the _is_a calls if (ACE_OS::strcmp (op.in (), "_is_a") != 0) @@ -369,13 +351,11 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h index c136eb18144..652a0f4ba9d 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h @@ -32,11 +32,11 @@ public: virtual ~Echo_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 ( @@ -85,11 +85,11 @@ public: ~Echo_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_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp index 31585a94528..c145b2fe700 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp @@ -30,7 +30,7 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); @@ -38,7 +38,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -46,11 +46,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h index f31756fb10a..ab24946aa27 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h @@ -37,13 +37,13 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp index 0990fd47209..a1a7b9fbb27 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp @@ -26,11 +26,9 @@ Client_Task::svc (void) CORBA::Object_var object = corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Test_Interceptors::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -41,10 +39,8 @@ Client_Task::svc (void) } 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 { @@ -64,29 +60,25 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_ENV_ARG_DECL) { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::Long one = 1, two = 1; (void) server->calculate (one, two ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_TRY { - (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + (void) server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -94,5 +86,4 @@ Client_Task::run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp index 15751d6f087..4f1ff3e4708 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp @@ -32,25 +32,21 @@ Echo_Client_ORBInitializer::post_init ( TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = PortableInterceptor::ORBInitInfo_3_1::_narrow(info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(info_3_1.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ClientRequestInterceptor_ptr interceptor = @@ -60,7 +56,6 @@ Echo_Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; @@ -75,16 +70,13 @@ Echo_Client_ORBInitializer::post_init ( orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, client_proc_mode_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info_3_1->add_client_request_interceptor_with_policy ( client_interceptor.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp index 9136e25e126..bb17b9dcbc4 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp @@ -29,32 +29,27 @@ Echo_Server_ORBInitializer::post_init ( ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); // TAO-Specific way to get to the ORB Core (and thus, the ORB). TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb()); if (CORBA::is_nil(orb.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ORBInitInfo_3_1_var info_3_1 = PortableInterceptor::ORBInitInfo_3_1::_narrow(info ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (CORBA::is_nil(info_3_1.in())) { ACE_THROW (CORBA::INTERNAL ()); - ACE_CHECK; } PortableInterceptor::ServerRequestInterceptor_ptr interceptor = @@ -64,7 +59,6 @@ Echo_Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; @@ -79,16 +73,13 @@ Echo_Server_ORBInitializer::post_init ( orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE, proc_mode_as_any ACE_ENV_ARG_PARAMETER); - ACE_CHECK; info_3_1->add_server_request_interceptor_with_policy ( server_interceptor.in (), policy_list ACE_ENV_ARG_PARAMETER); - ACE_CHECK; - policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + policy_list[0]->destroy (); policy_list[0] = CORBA::Policy::_nil (); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp index 7fbab820892..f33f57fbb52 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp @@ -31,7 +31,6 @@ Server_Task::svc (void) CORBA::Object_var poa_object = sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -40,14 +39,11 @@ Server_Task::svc (void) 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 (); Visual_i * server_impl = 0; ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1); @@ -55,21 +51,17 @@ Server_Task::svc (void) 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::Visual_var server = Test_Interceptors::Visual::_narrow (test_obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::String_var ior = this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); @@ -89,16 +81,13 @@ Server_Task::svc (void) // Signal the main thread before we call orb->run (); this->me_.signal (); - this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->run (); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + this->sorb_->destroy (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp index 399025fa883..2fe59bcd88a 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp @@ -25,14 +25,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -57,8 +57,7 @@ Echo_Client_Request_Interceptor::send_request ( client_interceptor_check_++; CORBA::String_var op = - ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::send_request\n")); @@ -71,8 +70,7 @@ Echo_Client_Request_Interceptor::send_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -94,8 +92,7 @@ Echo_Client_Request_Interceptor::receive_other ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_other " @@ -111,8 +108,7 @@ Echo_Client_Request_Interceptor::receive_reply ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::receive_reply " @@ -122,8 +118,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -134,8 +129,7 @@ Echo_Client_Request_Interceptor::receive_reply ( else if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -143,8 +137,7 @@ Echo_Client_Request_Interceptor::receive_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - 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; @@ -165,12 +158,10 @@ Echo_Client_Request_Interceptor::receive_exception ( { client_interceptor_check_++; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); CORBA::String_var exception_id = - ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Client_Request_Interceptor::received_exception " diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h index fc49396097a..fed9edd4a14 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_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 ( diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp index 78a62bdf25e..52b80caf5d9 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp @@ -90,7 +90,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter atc (argc, argv); CORBA::ORB_var orb = @@ -98,7 +97,6 @@ main (int argc, char *argv[]) atc.get_TCHAR_argv (), "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; Client_Task client_task (input, orb.in (), diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp index 9889379c63d..99dfbe20c3c 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp @@ -25,14 +25,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -55,12 +55,10 @@ Echo_Server_Request_Interceptor::receive_request ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); PortableInterceptor::ObjectId_var test_oid = - ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->object_id (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n", @@ -69,8 +67,7 @@ Echo_Server_Request_Interceptor::receive_request ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -84,8 +81,7 @@ Echo_Server_Request_Interceptor::receive_request ( } CORBA::String_var tmdi = - ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %s\n", @@ -100,8 +96,7 @@ Echo_Server_Request_Interceptor::send_reply ( { ++server_interceptor_check_; - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n", @@ -110,8 +105,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "normal") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -125,8 +119,7 @@ Echo_Server_Request_Interceptor::send_reply ( if (ACE_OS::strcmp (op.in (), "calculate") == 0) { Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -134,8 +127,7 @@ Echo_Server_Request_Interceptor::send_reply ( paramlist[i++].argument >>= param1; paramlist[i].argument >>= param2; - 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; @@ -154,8 +146,7 @@ Echo_Server_Request_Interceptor::send_exception ( ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { - CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_exception " @@ -164,8 +155,7 @@ Echo_Server_Request_Interceptor::send_exception ( CORBA::Any_var any = - ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->sending_exception (); CORBA::TypeCode_var type = any->type (); if (0 == type.in()) @@ -178,8 +168,7 @@ Echo_Server_Request_Interceptor::send_exception ( ++server_interceptor_check_; - const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + const char *exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %s\n", diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h index 1c6f50936a3..ebdc7d817d8 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h @@ -31,11 +31,11 @@ public: ~Echo_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_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp index 720d51ab9ad..43308b6cdfe 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp @@ -90,7 +90,6 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Argv_Type_Converter atc (argc, argv); CORBA::ORB_var orb = @@ -98,7 +97,6 @@ main (int argc, char *argv[]) atc.get_TCHAR_argv (), "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_Manual_Event me; Server_Task server_task (output, diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp index bf5fe31c9f8..066a8eee6b3 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp @@ -29,7 +29,7 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); @@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,11 +45,10 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + this->_remove_ref (); this->orb_->shutdown (); } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h index f31756fb10a..ab24946aa27 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h @@ -37,13 +37,13 @@ public: ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp index 881b1f2987f..0fb8a894577 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/Client_ORBInitializer.cpp @@ -29,7 +29,6 @@ Client_ORBInitializer::pre_init ( { PortableInterceptor::register_orb_initializer (second_ ACE_ENV_ARG_PARAMETER); - ACE_CHECK; // Registered the initializer, clear the pointer so that we only do it // once diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp index 9f716e09ada..6cad0525051 100644 --- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp +++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp @@ -31,15 +31,12 @@ main (int argc, char *argv[]) { PortableInterceptor::register_orb_initializer (initializer_var1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb2 = CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp index 9633a8d5413..77b56d9aae6 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_ORBInitializer.cpp @@ -27,11 +27,9 @@ Client_ORBInitializer::post_init ( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var orb_id = info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var orb_id = info->orb_id (); - CORBA::StringSeq_var args = info->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::StringSeq_var args = info->arguments (); CORBA::String_var forward_str; @@ -54,14 +52,12 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp index 822a351436d..fa98f896530 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp @@ -37,11 +37,9 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; info->add_server_request_interceptor (interceptor ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp index 9ab80aa7110..93c9c18b938 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp @@ -19,14 +19,14 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) } char * -Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h index 4dc535962a1..3d1a75e1528 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h @@ -42,10 +42,10 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void receive_request_service_contexts ( diff --git a/TAO/tests/Portable_Interceptors/Redirection/client.cpp b/TAO/tests/Portable_Interceptors/Redirection/client.cpp index 8da1c03c45b..4bb1941106e 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/client.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/client.cpp @@ -63,25 +63,21 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (::parse_args (argc, argv) != 0) return -1; CORBA::Object_var object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; RedirectionTest::test_var server = RedirectionTest::test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -98,8 +94,7 @@ main (int argc, char *argv[]) "CLIENT: Issuing request %d.\n", i)); - number = server->number (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + number = server->number (); ACE_DEBUG ((LM_INFO, "CLIENT: Request %d handled by object %d.\n", @@ -107,8 +102,7 @@ main (int argc, char *argv[]) number)); } - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); } ACE_CATCHANY { diff --git a/TAO/tests/Portable_Interceptors/Redirection/server.cpp b/TAO/tests/Portable_Interceptors/Redirection/server.cpp index 6ea299edcb3..2eb62181a6e 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/server.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/server.cpp @@ -62,16 +62,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; #endif /* TAO_HAS_INTERCEPTORS == 1 */ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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, @@ -80,11 +77,9 @@ 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 (); if (::parse_args (argc, argv) != 0) return -1; @@ -94,12 +89,10 @@ main (int argc, char *argv[]) PortableServer::ServantBase_var owner_transfer (test_impl); RedirectionTest::test_var test = - test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + test_impl->_this (); CORBA::String_var ior = orb->object_to_string (test.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; FILE *output_file= ACE_OS::fopen (ior_file, "w"); if (output_file == 0) @@ -111,18 +104,14 @@ main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n")); } diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp index 631d5a349e1..ab24a5f150b 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp @@ -18,14 +18,14 @@ test_i::~test_i (void) } CORBA::Short -test_i::number (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +test_i::number (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->number_; } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h index 643fb36e3c7..6a733639a65 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h @@ -26,11 +26,11 @@ public: ~test_i (void); /// Return the number assigned to this object. - virtual CORBA::Short number (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual CORBA::Short number (void) ACE_THROW_SPEC ((CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp index 87e209cd234..a39c6f98ec4 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp @@ -26,13 +26,11 @@ Server_ORBInitializer::pre_init ( ACE_NEW (test, test_i); - CORBA::Object_ptr object = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_ptr object = test->_this (); orbinitinfo->register_initial_reference ("MyService", object ACE_ENV_ARG_PARAMETER); - ACE_CHECK; bool invalid_name = false; ACE_TRY @@ -41,7 +39,6 @@ Server_ORBInitializer::pre_init ( orbinitinfo->register_initial_reference ("", object ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (PortableInterceptor::ORBInitInfo::InvalidName, ex) { diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp index efac5ba2c36..66a8db517fb 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp @@ -17,13 +17,11 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) ACE_NEW_RETURN (test, test_i, 1); - CORBA::Object_ptr object = test->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (1); + CORBA::Object_ptr object = test->_this (); orb->register_initial_reference ("ORBMyService", object ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (1); bool invalid_name = false; ACE_TRY @@ -32,7 +30,6 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) orb->register_initial_reference ("", object ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCH (CORBA::ORB::InvalidName, ex) { @@ -123,18 +120,14 @@ main (int argc, char *argv[]) { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; retval = test_orb (orb.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; PortableInterceptor::register_orb_initializer (initializer_var.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var second_orb = CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; } ACE_CATCHANY { 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 ceb1ab95ee1..5d2c4b0bfe0 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp @@ -36,14 +36,12 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var ci_interceptor = ci; info->add_client_request_interceptor (ci_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (ci, Client_Request_Interceptor ("CLIENT B"), @@ -52,13 +50,11 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; ci_interceptor = ci; info->add_client_request_interceptor (ci_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (ci, Client_Request_Interceptor ("CLIENT C"), @@ -67,11 +63,9 @@ Client_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; ci_interceptor = ci; info->add_client_request_interceptor (ci_interceptor.in () ACE_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 dba6578f6f2..337a9c2810e 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 @@ -25,7 +25,6 @@ Client_Request_Interceptor::send_request ( { CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -38,8 +37,7 @@ Client_Request_Interceptor::send_request ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -84,7 +82,6 @@ Client_Request_Interceptor::send_poll ( CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -105,7 +102,6 @@ Client_Request_Interceptor::receive_reply ( CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -120,8 +116,7 @@ Client_Request_Interceptor::receive_reply ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -165,7 +160,6 @@ Client_Request_Interceptor::receive_exception ( CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -180,8 +174,7 @@ Client_Request_Interceptor::receive_exception ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -195,13 +188,11 @@ Client_Request_Interceptor::receive_exception ( switch (scenario) { case 4: - exception = ri->received_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + exception = ri->received_exception (); tc = exception->type (); - id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + id = tc->id (); if (ACE_OS::strcmp (id, "IDL:Test/X:1.0") == 0) { @@ -249,7 +240,6 @@ Client_Request_Interceptor::receive_other ( CORBA::Boolean client_side = this->client_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!client_side) return; // Don't continue if the server side is being tested. @@ -266,8 +256,7 @@ Client_Request_Interceptor::client_side_test ( PortableInterceptor::ClientRequestInfo_ptr info ACE_ENV_ARG_DECL) { - CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::String_var op = info->operation (); return ACE_OS::strcmp (op.in (), "client_test") == 0 ? 1 : 0; } 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 c918a767b2c..f6417e34397 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -22,7 +22,7 @@ Request_Interceptor::name ( } void -Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL) +Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h index ade0ae89891..6f41abec934 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h @@ -58,10 +58,10 @@ public: */ //@{ /// Return the name of this Requestinterceptor. - virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual char * name (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)); //@} 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 eaf11509671..c7146736418 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp @@ -34,14 +34,12 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var si_interceptor = si; info->add_server_request_interceptor (si_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (si, Server_Request_Interceptor ("SERVER B"), @@ -50,13 +48,11 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; si_interceptor = si; info->add_server_request_interceptor (si_interceptor.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_NEW_THROW_EX (si, Server_Request_Interceptor ("SERVER C"), @@ -65,11 +61,9 @@ Server_ORBInitializer::post_init ( TAO::VMCID, ENOMEM), CORBA::COMPLETED_NO)); - ACE_CHECK; si_interceptor = si; info->add_server_request_interceptor (si_interceptor.in () ACE_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 45e9c1b1650..3a80bebc486 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 @@ -29,7 +29,6 @@ Server_Request_Interceptor::receive_request_service_contexts ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -76,7 +75,6 @@ Server_Request_Interceptor::receive_request ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -95,7 +93,6 @@ Server_Request_Interceptor::send_reply ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -110,8 +107,7 @@ Server_Request_Interceptor::send_reply ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -155,7 +151,6 @@ Server_Request_Interceptor::send_exception ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -170,8 +165,7 @@ Server_Request_Interceptor::send_exception ( { // Determine which test scenario we are in Dynamic::ParameterList_var paramlist = - ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + ri->arguments (); Test::TestScenario scenario; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -185,13 +179,11 @@ Server_Request_Interceptor::send_exception ( switch (scenario) { case 4: - exception = ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + exception = ri->sending_exception (); tc = exception->type (); - id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + id = tc->id (); if (ACE_OS::strcmp (id, "IDL:Test/X:1.0") == 0) { @@ -239,7 +231,6 @@ Server_Request_Interceptor::send_other ( CORBA::Boolean server_side = this->server_side_test (ri ACE_ENV_ARG_PARAMETER); - ACE_CHECK; if (!server_side) return; // Don't continue if the client side is being tested. @@ -256,8 +247,7 @@ Server_Request_Interceptor::server_side_test ( PortableInterceptor::ServerRequestInfo_ptr info ACE_ENV_ARG_DECL) { - CORBA::String_var op = info->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + CORBA::String_var op = info->operation (); return ACE_OS::strcmp (op.in (), "server_test") == 0 ? 1 : 0; } diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp index 52caf89e452..b607ad6df22 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp @@ -59,7 +59,6 @@ client_test (Test_ptr server ACE_ENV_ARG_DECL) ACE_TRY { server->client_test (i ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (i == 1) { @@ -93,7 +92,6 @@ client_test (Test_ptr server ACE_ENV_ARG_DECL) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } @@ -115,7 +113,6 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL) { CORBA::ULongSeq_var ulongseq; server->server_test (i, ulongseq.out () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (i == 1) { @@ -149,7 +146,6 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL) ACE_RE_THROW; } ACE_ENDTRY; - ACE_CHECK; } } @@ -170,24 +166,20 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Client ORB" 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_var server = Test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -198,16 +190,12 @@ main (int argc, char *argv[]) } ::client_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ::server_test (server.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->shutdown (); - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); } 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 6e4fa0d21d3..dcad7d0eb54 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp @@ -58,15 +58,12 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (orb_initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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, @@ -75,30 +72,25 @@ 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 (); if (::parse_args (argc, argv) != 0) return -1; test_i servant (orb.in ()); - CORBA::Object_var obj = servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Object_var obj = servant._this (); CORBA::String_var ior = orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Servant:\n<%s>\n", ior.in ())); - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + poa_manager->activate (); // Write IOR to a file. FILE *output_file= ACE_OS::fopen (ior_file, "w"); @@ -112,14 +104,11 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); // Run the ORB event loop. - orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->run (); root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + orb->destroy (); 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 17dee50ac55..e9cd269b863 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -59,7 +59,7 @@ test_i::server_test (Test::TestScenario scenario, } void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +test_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_INFO, 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 604d4ffb432..844bd60bc94 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -48,7 +48,7 @@ public: CORBA::SystemException)); /// Shutdown the ORB. - virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void shutdown (void) 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 fd053e810f0..4ce9d465ca0 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -28,8 +28,7 @@ Client_ORBInitializer::post_init ( { CORBA::String_var orb_id = - info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + info->orb_id (); PortableInterceptor::ClientRequestInterceptor_ptr interceptor = PortableInterceptor::ClientRequestInterceptor::_nil (); @@ -38,13 +37,11 @@ Client_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Client_Request_Interceptor (orb_id.in ()), CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in () ACE_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 0ad8960c819..97f30fa7092 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp @@ -33,13 +33,11 @@ Server_ORBInitializer::post_init ( ACE_NEW_THROW_EX (interceptor, Echo_Server_Request_Interceptor, CORBA::NO_MEMORY ()); - ACE_CHECK; PortableInterceptor::ServerRequestInterceptor_var server_interceptor = interceptor; info->add_server_request_interceptor (server_interceptor.in () ACE_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 80c6cfad678..ed6361d5ece 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp @@ -42,30 +42,26 @@ run_test (Test_Interceptors::Visual_ptr server { server->normal (10 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "\"normal\" operation done\n")); - server->nothing (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + server->nothing (); ACE_DEBUG ((LM_DEBUG, "\"nothing\" operation done\n")); ACE_TRY { - server->user (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + server->user (); } ACE_CATCH (Test_Interceptors::Silly, userex) { ACE_DEBUG ((LM_DEBUG, "Caught Silly\n")); } ACE_ENDTRY; - ACE_CHECK; ACE_TRY_EX (SYS) { - server->system (ACE_ENV_SINGLE_ARG_PARAMETER); + server->system (); ACE_TRY_CHECK_EX (SYS); } ACE_CATCH (CORBA::INV_OBJREF, sysex) @@ -73,7 +69,6 @@ run_test (Test_Interceptors::Visual_ptr server ACE_DEBUG ((LM_DEBUG, "Caught CORBA::INV_OBJREF\n")); } ACE_ENDTRY; - ACE_CHECK; } int @@ -91,22 +86,18 @@ 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::Visual_var server = Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; if (CORBA::is_nil (server.in ())) { @@ -117,10 +108,8 @@ main (int argc, char *argv[]) } 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/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp index e9ef8474a32..d054310e84c 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp @@ -26,14 +26,14 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) } char * -Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Client_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -61,18 +61,14 @@ Echo_Client_Request_Interceptor::send_request ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if 0 ACE_DEBUG ((LM_DEBUG, @@ -99,12 +95,10 @@ Echo_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; // Check that the request service context can be retrieved. IOP::ServiceContext_var sc2 = ri->get_request_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -133,18 +127,14 @@ Echo_Client_Request_Interceptor::receive_reply ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if 0 ACE_DEBUG ((LM_DEBUG, @@ -159,7 +149,6 @@ Echo_Client_Request_Interceptor::receive_reply ( // expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -179,7 +168,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -220,18 +208,14 @@ Echo_Client_Request_Interceptor::receive_exception ( this->orb_ = CORBA::ORB_init (argc, 0, this->orb_id_.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); - CORBA::Object_var target = ri->target (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::Object_var target = ri->target (); CORBA::String_var ior = this->orb_->object_to_string (target.in () ACE_ENV_ARG_PARAMETER); - ACE_CHECK; #if 0 ACE_DEBUG ((LM_DEBUG, @@ -246,7 +230,6 @@ Echo_Client_Request_Interceptor::receive_exception ( // expected. IOP::ServiceContext_var sc = ri->get_reply_service_context (::service_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -267,7 +250,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h index 10fcbd62f70..2214ee1e99a 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h @@ -31,11 +31,11 @@ public: virtual ~Echo_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 diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp index bb361528705..f6fce516ba9 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp @@ -53,16 +53,13 @@ main (int argc, char *argv[]) PortableInterceptor::register_orb_initializer (initializer.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; // Now we can create the ORB CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; 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, @@ -71,14 +68,11 @@ 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 (); if (parse_args (argc, argv) != 0) return 1; @@ -88,21 +82,17 @@ main (int argc, char *argv[]) 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::Visual_var server = Test_Interceptors::Visual::_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::Visual: <%s>\n", @@ -121,13 +111,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/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp index d253b1ab045..601e2028709 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp @@ -24,14 +24,14 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) } char * -Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::name (void) ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Echo_Server_Request_Interceptor::destroy (void) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -44,8 +44,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.receive_request_service_contexts from " @@ -56,7 +55,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( IOP::ServiceId id = ::service_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 ()); @@ -88,7 +86,6 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts ( // Add this context to the service context list. ri->add_reply_service_context (scc, 0 ACE_ENV_ARG_PARAMETER); - ACE_CHECK; } @@ -109,8 +106,7 @@ Echo_Server_Request_Interceptor::send_reply ( ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); ACE_DEBUG ((LM_DEBUG, "%s.send_reply from \"%s\"\n", @@ -120,7 +116,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -141,7 +136,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); @@ -164,8 +158,7 @@ Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ForwardRequest)) { - CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK; + CORBA::String_var operation = ri->operation (); #if 0 ACE_DEBUG ((LM_DEBUG, @@ -177,7 +170,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf = reinterpret_cast<const char *> (sc->context_data.get_buffer ()); @@ -198,7 +190,6 @@ 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_ENV_ARG_PARAMETER); - ACE_CHECK; const char *buf2 = reinterpret_cast<const char *> (sc2->context_data.get_buffer ()); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h index 9549d70f549..6fc60276759 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h @@ -31,11 +31,11 @@ public: ~Echo_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 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 503c7a5b423..a7839f0a2cd 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -21,14 +21,14 @@ Visual_i::normal (CORBA::Long arg } void -Visual_i::nothing (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +Visual_i::nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)) { @@ -37,7 +37,7 @@ Visual_i::user (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::system (void) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); @@ -45,9 +45,8 @@ Visual_i::system (ACE_ENV_SINGLE_ARG_DECL) } void -Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) +Visual_i::shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0 ACE_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 5a6df58c457..fbe117ea5d2 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h @@ -32,17 +32,17 @@ public: ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - void nothing (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void nothing (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void user (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void user (void) ACE_THROW_SPEC ((CORBA::SystemException, Test_Interceptors::Silly)); - void system (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void system (void) ACE_THROW_SPEC ((CORBA::SystemException)); - void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException)); private: |