diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp')
| -rw-r--r-- | TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp | 68 |
1 files changed, 24 insertions, 44 deletions
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", |