summaryrefslogtreecommitdiff
path: root/TAO/tao/ClientRequestInfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/ClientRequestInfo.cpp')
-rw-r--r--TAO/tao/ClientRequestInfo.cpp82
1 files changed, 41 insertions, 41 deletions
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index da2cbcd1412..72692b0040a 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -30,14 +30,14 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO_GIOP_Invocation *inv,
}
CORBA::Object_ptr
-TAO_ClientRequestInfo::target (CORBA::Environment &)
+TAO_ClientRequestInfo::target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::Object::_duplicate (this->target_);
}
CORBA::Object_ptr
-TAO_ClientRequestInfo::effective_target (CORBA::Environment &)
+TAO_ClientRequestInfo::effective_target (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ == PortableInterceptor::LOCATION_FORWARD)
@@ -52,7 +52,7 @@ TAO_ClientRequestInfo::effective_target (CORBA::Environment &)
}
IOP::TaggedProfile *
-TAO_ClientRequestInfo::effective_profile (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::effective_profile (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
IOP::TaggedProfile *tagged_profile = 0;
@@ -80,7 +80,7 @@ TAO_ClientRequestInfo::effective_profile (CORBA::Environment &ACE_TRY_ENV)
// exception from an Any. This method is in place just to be compliant
// with the spec.
CORBA::Any *
-TAO_ClientRequestInfo::received_exception (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::received_exception (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -116,7 +116,7 @@ TAO_ClientRequestInfo::received_exception (CORBA::Environment &ACE_TRY_ENV)
// = TAO specific method done since there currently is no simple way
// to extract exceptions from an Any
CORBA::Exception *
-TAO_ClientRequestInfo::_received_exception (CORBA::Environment &)
+TAO_ClientRequestInfo::_received_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->caught_exception_;
@@ -124,7 +124,7 @@ TAO_ClientRequestInfo::_received_exception (CORBA::Environment &)
char *
TAO_ClientRequestInfo::received_exception_id (
- CORBA::Environment &ACE_TRY_ENV)
+ TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -140,8 +140,8 @@ TAO_ClientRequestInfo::received_exception_id (
IOP::TaggedComponent *
TAO_ClientRequestInfo::get_effective_component (
- IOP::ComponentId id,
- CORBA::Environment &ACE_TRY_ENV)
+ IOP::ComponentId id
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_Tagged_Components &ecs =
@@ -185,8 +185,8 @@ TAO_ClientRequestInfo::get_effective_component (
IOP::TaggedComponentSeq *
TAO_ClientRequestInfo::get_effective_components (
- IOP::ComponentId id,
- CORBA::Environment &ACE_TRY_ENV)
+ IOP::ComponentId id
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_Tagged_Components &ecs =
@@ -239,15 +239,15 @@ TAO_ClientRequestInfo::get_effective_components (
}
CORBA::Policy_ptr
-TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type,
- CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// @@ Do we need to look anywhere else for the request policies?
#if TAO_HAS_CORBA_MESSAGING == 1
- return this->target_->_get_policy (type,
- ACE_TRY_ENV);
+ return this->target_->_get_policy (type
+ TAO_ENV_ARG_PARAMETER);
#else
ACE_UNUSED_ARG (type);
@@ -263,8 +263,8 @@ TAO_ClientRequestInfo::get_request_policy (CORBA::PolicyType type,
void
TAO_ClientRequestInfo::add_request_service_context (
const IOP::ServiceContext & service_context,
- CORBA::Boolean replace,
- CORBA::Environment &ACE_TRY_ENV)
+ CORBA::Boolean replace
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Get the service context from the list
@@ -279,7 +279,7 @@ TAO_ClientRequestInfo::add_request_service_context (
}
CORBA::ULong
-TAO_ClientRequestInfo::request_id (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// @todo We may have to worry about AMI once we support interceptors
@@ -359,14 +359,14 @@ TAO_ClientRequestInfo::request_id (CORBA::Environment &ACE_TRY_ENV)
}
char *
-TAO_ClientRequestInfo::operation (CORBA::Environment &)
+TAO_ClientRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->invocation_->operation ());
}
Dynamic::ParameterList *
-TAO_ClientRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -375,7 +375,7 @@ TAO_ClientRequestInfo::arguments (CORBA::Environment &ACE_TRY_ENV)
}
Dynamic::ExceptionList *
-TAO_ClientRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -384,7 +384,7 @@ TAO_ClientRequestInfo::exceptions (CORBA::Environment &ACE_TRY_ENV)
}
Dynamic::ContextList *
-TAO_ClientRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -393,7 +393,7 @@ TAO_ClientRequestInfo::contexts (CORBA::Environment &ACE_TRY_ENV)
}
Dynamic::RequestContext *
-TAO_ClientRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -402,7 +402,7 @@ TAO_ClientRequestInfo::operation_context (CORBA::Environment &ACE_TRY_ENV)
}
CORBA::Any *
-TAO_ClientRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -411,7 +411,7 @@ TAO_ClientRequestInfo::result (CORBA::Environment &ACE_TRY_ENV)
}
CORBA::Boolean
-TAO_ClientRequestInfo::response_expected (CORBA::Environment &)
+TAO_ClientRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->response_expected_;
@@ -419,7 +419,7 @@ TAO_ClientRequestInfo::response_expected (CORBA::Environment &)
# if TAO_HAS_CORBA_MESSAGING == 1
CORBA::Short
-TAO_ClientRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_GIOP_Oneway_Invocation *inv =
@@ -442,7 +442,7 @@ TAO_ClientRequestInfo::sync_scope (CORBA::Environment &ACE_TRY_ENV)
#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
PortableInterceptor::ReplyStatus
-TAO_ClientRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ == -1)
@@ -455,7 +455,7 @@ TAO_ClientRequestInfo::reply_status (CORBA::Environment &ACE_TRY_ENV)
}
CORBA::Object_ptr
-TAO_ClientRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
@@ -470,8 +470,8 @@ TAO_ClientRequestInfo::forward_reference (CORBA::Environment &ACE_TRY_ENV)
}
CORBA::Any *
-TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id,
- CORBA::Environment &ACE_TRY_ENV)
+TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::InvalidSlot))
{
@@ -493,14 +493,14 @@ TAO_ClientRequestInfo::get_slot (PortableInterceptor::SlotId id,
// PICurrent is read-only during a request invocation on the client
// side. No copying is necessary.
return
- pi_current->get_slot (id,
- ACE_TRY_ENV);
+ pi_current->get_slot (id
+ TAO_ENV_ARG_PARAMETER);
}
IOP::ServiceContext *
TAO_ClientRequestInfo::get_request_service_context (
- IOP::ServiceId id,
- CORBA::Environment &ACE_TRY_ENV)
+ IOP::ServiceId id
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Get the service context from the list
@@ -508,15 +508,15 @@ TAO_ClientRequestInfo::get_request_service_context (
this->invocation_->request_service_context ();
return this->get_service_context_i (service_context_list,
- id,
- ACE_TRY_ENV);
+ id
+ TAO_ENV_ARG_PARAMETER);
}
IOP::ServiceContext *
TAO_ClientRequestInfo::get_reply_service_context (
- IOP::ServiceId id,
- CORBA::Environment &ACE_TRY_ENV)
+ IOP::ServiceId id
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Get the service context from the list
@@ -524,15 +524,15 @@ TAO_ClientRequestInfo::get_reply_service_context (
this->invocation_->reply_service_context ();
return this->get_service_context_i (service_context_list,
- id,
- ACE_TRY_ENV);
+ id
+ TAO_ENV_ARG_PARAMETER);
}
IOP::ServiceContext *
TAO_ClientRequestInfo::get_service_context_i (
TAO_Service_Context &service_context_list,
- IOP::ServiceId id,
- CORBA::Environment &ACE_TRY_ENV)
+ IOP::ServiceId id
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Create a new service context to be returned. Assume
View Lorry Controller Status