summaryrefslogtreecommitdiff
path: root/TAO/tao/PortableServer/ServerRequestInfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/PortableServer/ServerRequestInfo.cpp')
-rw-r--r--TAO/tao/PortableServer/ServerRequestInfo.cpp72
1 files changed, 36 insertions, 36 deletions
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 4dea2e6e54b..bf2bb46aec5 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -33,7 +33,7 @@ TAO_ServerRequestInfo::TAO_ServerRequestInfo (
}
CORBA::ULong
-TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// The request ID returned by this method need not correspond to the
@@ -76,14 +76,14 @@ TAO_ServerRequestInfo::request_id (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
}
char *
-TAO_ServerRequestInfo::operation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::string_dup (this->server_request_.operation ());
}
Dynamic::ParameterList *
-TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -92,7 +92,7 @@ TAO_ServerRequestInfo::arguments (TAO_ENV_SINGLE_ARG_DECL)
}
Dynamic::ExceptionList *
-TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -101,7 +101,7 @@ TAO_ServerRequestInfo::exceptions (TAO_ENV_SINGLE_ARG_DECL)
}
Dynamic::ContextList *
-TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::contexts (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -110,7 +110,7 @@ TAO_ServerRequestInfo::contexts (TAO_ENV_SINGLE_ARG_DECL)
}
Dynamic::RequestContext *
-TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::operation_context (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -119,7 +119,7 @@ TAO_ServerRequestInfo::operation_context (TAO_ENV_SINGLE_ARG_DECL)
}
CORBA::Any *
-TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
@@ -128,7 +128,7 @@ TAO_ServerRequestInfo::result (TAO_ENV_SINGLE_ARG_DECL)
}
CORBA::Boolean
-TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerRequestInfo::response_expected (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->server_request_.response_expected ();
@@ -136,7 +136,7 @@ TAO_ServerRequestInfo::response_expected (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
# if TAO_HAS_CORBA_MESSAGING == 1
Messaging::SyncScope
-TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->server_request_.sync_with_server ())
@@ -149,7 +149,7 @@ TAO_ServerRequestInfo::sync_scope (TAO_ENV_SINGLE_ARG_DECL)
#endif /* TAO_HAS_CORBA_MESSAGING */
PortableInterceptor::ReplyStatus
-TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::reply_status (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ == -1)
@@ -162,7 +162,7 @@ TAO_ServerRequestInfo::reply_status (TAO_ENV_SINGLE_ARG_DECL)
}
CORBA::Object_ptr
-TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::forward_reference (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ != PortableInterceptor::LOCATION_FORWARD)
@@ -177,7 +177,7 @@ TAO_ServerRequestInfo::forward_reference (TAO_ENV_SINGLE_ARG_DECL)
CORBA::Any *
TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::InvalidSlot))
{
@@ -189,20 +189,20 @@ TAO_ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
if (pi_current == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
- pi_current->check_validity (id TAO_ENV_ARG_PARAMETER);
+ pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
// Retrieve the request scope PICurrent object.
TAO_PICurrent_Impl &rsc = this->server_request_.rs_pi_current ();
- return rsc.get_slot (id TAO_ENV_ARG_PARAMETER);
+ return rsc.get_slot (id ACE_ENV_ARG_PARAMETER);
}
IOP::ServiceContext *
TAO_ServerRequestInfo::get_request_service_context (
IOP::ServiceId id
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_Service_Context &service_context_list =
@@ -210,13 +210,13 @@ TAO_ServerRequestInfo::get_request_service_context (
return this->get_service_context_i (service_context_list,
id
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
IOP::ServiceContext *
TAO_ServerRequestInfo::get_reply_service_context (
IOP::ServiceId id
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_Service_Context &service_context_list =
@@ -224,14 +224,14 @@ TAO_ServerRequestInfo::get_reply_service_context (
return this->get_service_context_i (service_context_list,
id
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
IOP::ServiceContext *
TAO_ServerRequestInfo::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))
{
// Create a new service context to be returned. Assume
@@ -267,7 +267,7 @@ TAO_ServerRequestInfo::get_service_context_i (
// exception from an Any. This method is in place just to be compliant
// with the spec.
CORBA::Any *
-TAO_ServerRequestInfo::sending_exception (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->reply_status_ != PortableInterceptor::SYSTEM_EXCEPTION
@@ -304,14 +304,14 @@ TAO_ServerRequestInfo::sending_exception (TAO_ENV_SINGLE_ARG_DECL)
// = TAO specific method done since there currently is no simple way
// to extract exceptions from an Any
CORBA::Exception *
-TAO_ServerRequestInfo::_sending_exception (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_ServerRequestInfo::_sending_exception (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return this->caught_exception_;
}
char *
-TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::server_id (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->servant_upcall_ != 0)
@@ -325,7 +325,7 @@ TAO_ServerRequestInfo::server_id (TAO_ENV_SINGLE_ARG_DECL)
}
char *
-TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::orb_id (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->servant_upcall_ != 0)
@@ -338,7 +338,7 @@ TAO_ServerRequestInfo::orb_id (TAO_ENV_SINGLE_ARG_DECL)
}
PortableInterceptor::AdapterName *
-TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Fill in later
@@ -354,7 +354,7 @@ TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL)
{
CORBA::StringSeq *adapter_name = 0;
adapter_name =
- this->servant_upcall_->poa ().adapter_name (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->servant_upcall_->poa ().adapter_name (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
return adapter_name;
@@ -366,7 +366,7 @@ TAO_ServerRequestInfo::adapter_name (TAO_ENV_SINGLE_ARG_DECL)
}
CORBA::OctetSeq *
-TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->servant_upcall_ != 0)
@@ -409,11 +409,11 @@ TAO_ServerRequestInfo::object_id (TAO_ENV_SINGLE_ARG_DECL)
}
CORBA::OctetSeq *
-TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL)
+TAO_ServerRequestInfo::adapter_id (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
if (this->servant_upcall_ != 0)
- return this->servant_upcall_->poa ().id (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return this->servant_upcall_->poa ().id (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14,
CORBA::COMPLETED_NO),
@@ -422,7 +422,7 @@ TAO_ServerRequestInfo::adapter_id (TAO_ENV_SINGLE_ARG_DECL)
char *
TAO_ServerRequestInfo::target_most_derived_interface (
- TAO_ENV_SINGLE_ARG_DECL)
+ ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Implemented in the generated skeleton.
@@ -434,7 +434,7 @@ TAO_ServerRequestInfo::target_most_derived_interface (
CORBA::Policy_ptr
TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// @@ Currently, it is only possible to retrieve the server policy
@@ -458,7 +458,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type
// object reference!!!
CORBA::Policy_var policy = policies.get_policy_by_index (i);
- CORBA::PolicyType ptype = policy->policy_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::PolicyType ptype = policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::Policy::_nil ());
if (ptype == type)
@@ -482,7 +482,7 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type
void
TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
const CORBA::Any &data
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException,
PortableInterceptor::InvalidSlot))
{
@@ -494,7 +494,7 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
if (pi_current == 0)
ACE_THROW (CORBA::INTERNAL ());
- pi_current->check_validity (id TAO_ENV_ARG_PARAMETER);
+ pi_current->check_validity (id ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
// Retrieve the "request scope current" (RSC).
@@ -507,13 +507,13 @@ TAO_ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
if (tsc != 0)
tsc->copy (rsc, 1); // Deep copy
- rsc.set_slot (id, data TAO_ENV_ARG_PARAMETER);
+ rsc.set_slot (id, data ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
CORBA::Boolean
TAO_ServerRequestInfo::target_is_a (const char * /* id */
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Implemented in the generated skeleton.
@@ -526,7 +526,7 @@ void
TAO_ServerRequestInfo::add_reply_service_context (
const IOP::ServiceContext & service_context,
CORBA::Boolean replace
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Get the service context from the list
View Lorry Controller Status