diff options
Diffstat (limited to 'TAO/tao/PortableServer/POAManager.i')
| -rw-r--r-- | TAO/tao/PortableServer/POAManager.i | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i index aec6e34cd32..66f172859ee 100644 --- a/TAO/tao/PortableServer/POAManager.i +++ b/TAO/tao/PortableServer/POAManager.i @@ -9,46 +9,46 @@ TAO_POA_Manager::lock (void) } ACE_INLINE void -TAO_POA_Manager::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->activate_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_i (ACE_ENV_SINGLE_ARG_PARAMETER); } #if (TAO_HAS_MINIMUM_POA == 0) ACE_INLINE void TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->hold_requests_i (wait_for_completion TAO_ENV_ARG_PARAMETER); + this->hold_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; - this->discard_requests_i (wait_for_completion TAO_ENV_ARG_PARAMETER); + this->discard_requests_i (wait_for_completion ACE_ENV_ARG_PARAMETER); } ACE_INLINE void TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::POAManager::AdapterInactive)) { @@ -57,7 +57,7 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, this->deactivate_i (etherealize_objects, wait_for_completion - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -70,7 +70,7 @@ TAO_POA_Manager::get_state_i (void) } ACE_INLINE PortableServer::POAManager::State -TAO_POA_Manager::get_state (TAO_ENV_SINGLE_ARG_DECL) +TAO_POA_Manager::get_state (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access to the POAManager for the duration of this transaction |