diff options
Diffstat (limited to 'TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp')
-rw-r--r-- | TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp | 34 |
1 files changed, 8 insertions, 26 deletions
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 ()); |