diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp')
| -rw-r--r-- | TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp index ed90dd7815f..0a472efebf6 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp @@ -30,33 +30,31 @@ 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)) { } void Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_ERROR((LM_ERROR, "ERROR, unexpected interception point called send_poll()\n")); - ACE_THROW(CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } void Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { @@ -69,15 +67,11 @@ 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; + 0); // 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; + ri->get_request_service_context (::service_id); if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -85,7 +79,7 @@ Echo_Client_Request_Interceptor::send_request ( magic_cookie_len) != 0 ) { - ACE_THROW(CORBA::BAD_PARAM()); + throw CORBA::BAD_PARAM(); } Echo_Client_Request_Interceptor::request_count++; @@ -93,15 +87,12 @@ Echo_Client_Request_Interceptor::send_request ( void Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException)) { // 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; + ri->get_request_service_context (::service_id); if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -109,7 +100,7 @@ Echo_Client_Request_Interceptor::receive_reply ( magic_cookie_len) != 0 ) { - ACE_THROW(CORBA::BAD_PARAM()); + throw CORBA::BAD_PARAM(); } Echo_Client_Request_Interceptor::reply_count++; @@ -117,16 +108,13 @@ Echo_Client_Request_Interceptor::receive_reply ( void Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri - ACE_ENV_ARG_DECL) + PortableInterceptor::ClientRequestInfo_ptr ri) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { // 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; + ri->get_request_service_context (::service_id); if (rc->context_data.length() != magic_cookie_len || ACE_OS::memcmp( @@ -134,7 +122,7 @@ Echo_Client_Request_Interceptor::receive_other ( magic_cookie_len) != 0 ) { - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); } Echo_Client_Request_Interceptor::other_count++; @@ -142,8 +130,7 @@ Echo_Client_Request_Interceptor::receive_other ( void Echo_Client_Request_Interceptor::receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr - ACE_ENV_ARG_DECL_NOT_USED) + PortableInterceptor::ClientRequestInfo_ptr) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) { |