diff options
Diffstat (limited to 'TAO/tao/RTPortableServer/RT_POA.i')
| -rw-r--r-- | TAO/tao/RTPortableServer/RT_POA.i | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i index 30cbbb17de3..2a1dc09cde9 100644 --- a/TAO/tao/RTPortableServer/RT_POA.i +++ b/TAO/tao/RTPortableServer/RT_POA.i @@ -7,37 +7,37 @@ ACE_INLINE CORBA::Object_ptr TAO_RT_POA::create_reference_with_priority (const char * intf, RTCORBA::Priority priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. - this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - this->validate_priority (priority TAO_ENV_ARG_PARAMETER); + this->validate_priority (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); return this->create_reference_i (intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE CORBA::Object_ptr TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectId & oid, const char * intf, RTCORBA::Priority priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. - this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); - this->validate_priority (priority TAO_ENV_ARG_PARAMETER); + this->validate_priority (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); // Lock access for the duration of this transaction. @@ -45,22 +45,22 @@ TAO_RT_POA::create_reference_with_id_and_priority (const PortableServer::ObjectI return this->create_reference_with_id_i (oid, intf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE PortableServer::ObjectId * TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant, RTCORBA::Priority priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. - this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - this->validate_priority (priority TAO_ENV_ARG_PARAMETER); + this->validate_priority (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Lock access for the duration of this transaction. @@ -68,24 +68,24 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant, return this->activate_object_i (servant, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId & oid, PortableServer::Servant servant, RTCORBA::Priority priority - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, PortableServer::POA::ObjectAlreadyActive, PortableServer::POA::WrongPolicy)) { // Check that this method can be used based on this POA's policies. - this->validate_policies (TAO_ENV_SINGLE_ARG_PARAMETER); + this->validate_policies (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->validate_priority (priority TAO_ENV_ARG_PARAMETER); + this->validate_priority (priority ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Lock access for the duration of this transaction. @@ -94,7 +94,7 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId this->activate_object_with_id_i (oid, servant, priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } ACE_INLINE void * |