diff options
Diffstat (limited to 'TAO/tao/ClientRequestInfo_i.h')
| -rw-r--r-- | TAO/tao/ClientRequestInfo_i.h | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/TAO/tao/ClientRequestInfo_i.h b/TAO/tao/ClientRequestInfo_i.h index b1488d2f0f9..43245ee3431 100644 --- a/TAO/tao/ClientRequestInfo_i.h +++ b/TAO/tao/ClientRequestInfo_i.h @@ -53,46 +53,46 @@ public: /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. CORBA::ULong request_id ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the operation name for the current request. char * operation ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments (TAO_ENV_SINGLE_ARG_DECL) + virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions (TAO_ENV_SINGLE_ARG_DECL) + virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); Dynamic::ContextList * contexts ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); Dynamic::RequestContext * operation_context ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) 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 (TAO_ENV_SINGLE_ARG_DECL) + virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Returns true for a two-way operation, and false otherwise. - CORBA::Boolean response_expected (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Boolean response_expected (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) ; #if TAO_HAS_CORBA_MESSAGING == 1 /// Return the sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. - CORBA::Short sync_scope (TAO_ENV_SINGLE_ARG_DECL) + CORBA::Short sync_scope (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -101,19 +101,19 @@ public: /// USER_EXCEPTION, LOCATION_FORWARD, LOCATION_FORWARD_PERMANENT, /// TRANSPORT_RETRY. PortableInterceptor::ReplyStatus reply_status ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) 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. CORBA::Object_ptr forward_reference ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) ; CORBA::Any * get_slot ( PortableInterceptor::SlotId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::InvalidSlot)); @@ -121,30 +121,30 @@ public: /// from the request service context list. IOP::ServiceContext * get_request_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the IOP::ServiceContext with the given IOP::ServiceId /// from the reply service context list. IOP::ServiceContext * get_reply_service_context ( IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the (initial, non-forwarded, or permanently forwarded) /// object reference of the target. CORBA::Object_ptr target ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the object reference for the current target. The target /// may change in the even of a location forward. CORBA::Object_ptr effective_target ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); IOP::TaggedProfile * effective_profile ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return an Any containing the received exception, if any. @@ -153,12 +153,12 @@ public: * @note There is no trivial way to extract the exception from an Any. */ CORBA::Any * received_exception ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the repository ID for the received exception. char * received_exception_id ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the first IOP::TaggedComponent that matches the given @@ -166,7 +166,7 @@ public: /// target. IOP::TaggedComponent * get_effective_component ( IOP::ComponentId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return all IOP::TaggedComponent(s) that match the given @@ -174,14 +174,14 @@ public: /// target. IOP::TaggedComponentSeq * get_effective_components ( IOP::ComponentId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Return the policy of the given type in effect for the current /// request. CORBA::Policy_ptr get_request_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Add the IOP::ServiceContext to the request (outgoing) @@ -189,7 +189,7 @@ public: void add_request_service_context ( const IOP::ServiceContext & service_context, CORBA::Boolean replace - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -223,7 +223,7 @@ protected: IOP::ServiceContext *get_service_context_i ( TAO_Service_Context &service_context_list, IOP::ServiceId id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); protected: |