summaryrefslogtreecommitdiff
path: root/TAO/tao/ClientRequestInfo.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/ClientRequestInfo.h')
-rw-r--r--TAO/tao/ClientRequestInfo.h66
1 files changed, 33 insertions, 33 deletions
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index a5c78d180d4..be0c5220b21 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -60,43 +60,43 @@ public:
/// Return an ID unique to the current request. This request ID may
/// or may not be the same as the GIOP request ID.
virtual CORBA::ULong request_id (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the operation name for the current request.
virtual char * operation (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the list of arguments passed to the current operation.
virtual Dynamic::ParameterList * arguments (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the list of exceptions the current operation is capable
/// of throwing.
virtual Dynamic::ExceptionList * exceptions (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual Dynamic::ContextList * contexts (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual Dynamic::RequestContext * operation_context (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the result of the current request. If there is no return
/// value then an Any with tk_void TypeCode is returned. This is
/// method is not valid for oneway operations.
virtual CORBA::Any * result (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Returns true for a two-way operation, and false otherwise.
virtual CORBA::Boolean response_expected (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException)) ;
#if TAO_HAS_CORBA_MESSAGING == 1
@@ -104,7 +104,7 @@ public:
/// operation. If the operation is not a one-way, a
/// CORBA::BAD_INV_ORDER exception is thrown.
virtual CORBA::Short sync_scope (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
#endif /* TAO_HAS_CORBA_MESSAGING == 1 */
@@ -113,50 +113,50 @@ public:
/// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT,
/// TRANSPORT_RETRY.
virtual PortableInterceptor::ReplyStatus reply_status (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// If the reply status is PortableInterceptor::LOCATION_FORWARD or
/// PortableInterceptor::LOCATION_FORWARD_PERMANENT, return the
/// object reference to which the request was forwarded.
virtual CORBA::Object_ptr forward_reference (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException)) ;
virtual CORBA::Any * get_slot (
- PortableInterceptor::SlotId id,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ PortableInterceptor::SlotId id
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::InvalidSlot));
/// Return the IOP::ServiceContext with the given IOP::ServiceId
/// from the request service context list.
virtual IOP::ServiceContext * get_request_service_context (
- IOP::ServiceId id,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ IOP::ServiceId id
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the IOP::ServiceContext with the given IOP::ServiceId
/// from the reply service context list.
virtual IOP::ServiceContext * get_reply_service_context (
- IOP::ServiceId id,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ IOP::ServiceId id
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the (initial, non-forwarded, or permanently forwarded)
/// object reference of the target.
virtual CORBA::Object_ptr target (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the object reference for the current target. The target
/// may change in the even of a location forward.
virtual CORBA::Object_ptr effective_target (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual IOP::TaggedProfile * effective_profile (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return an Any containing the received exception, if any.
@@ -165,7 +165,7 @@ public:
* @note There is no trivial way to extract the exception from an Any.
*/
virtual CORBA::Any * received_exception (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
@@ -174,43 +174,43 @@ public:
* possible.
*/
virtual CORBA::Exception * _received_exception (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the repository ID for the received exception.
virtual char * received_exception_id (
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the first IOP::TaggedComponent that matches the given
/// IOP::ComponentId in the object reference for the current
/// target.
virtual IOP::TaggedComponent * get_effective_component (
- IOP::ComponentId id,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ IOP::ComponentId id
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return all IOP::TaggedComponent(s) that match the given
/// IOP::ComponentId in the object reference for the current
/// target.
virtual IOP::TaggedComponentSeq * get_effective_components (
- IOP::ComponentId id,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ IOP::ComponentId id
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Return the policy of the given type in effect for the current
/// request.
virtual CORBA::Policy_ptr get_request_policy (
- CORBA::PolicyType type,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ CORBA::PolicyType type
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/// Add the IOP::ServiceContext to the request (outgoing)
/// IOP::ServiceContextList.
virtual void add_request_service_context (
const IOP::ServiceContext & service_context,
- CORBA::Boolean replace,
- CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+ CORBA::Boolean replace
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
/**
@@ -243,8 +243,8 @@ protected:
/// Helper method to get the request and response service contexts.
IOP::ServiceContext *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));
protected: