diff options
Diffstat (limited to 'TAO/tao/PortableServer/POAManager.inl')
| -rw-r--r-- | TAO/tao/PortableServer/POAManager.inl | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl index cfbdb77cd85..066b1112a38 100644 --- a/TAO/tao/PortableServer/POAManager.inl +++ b/TAO/tao/PortableServer/POAManager.inl @@ -2,8 +2,8 @@ // // $Id$ -#include "tao/Environment.h" #include "tao/SystemException.h" +#include "ace/CORBA_macros.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -15,11 +15,7 @@ TAO_POA_Manager::lock (void) ACE_INLINE void TAO_POA_Manager::activate (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) -{ - // Lock access to the POAManager for the duration of this transaction - TAO_OBJECT_ADAPTER_GUARD; + {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD; this->activate_i (); } @@ -28,22 +24,14 @@ TAO_POA_Manager::activate (void) ACE_INLINE void TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) -{ - // Lock access to the POAManager for the duration of this transaction - TAO_OBJECT_ADAPTER_GUARD; + {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD; this->hold_requests_i (wait_for_completion); } ACE_INLINE void TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) -{ - // Lock access to the POAManager for the duration of this transaction - TAO_OBJECT_ADAPTER_GUARD; + {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD; this->discard_requests_i (wait_for_completion); } @@ -51,11 +39,7 @@ TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion) ACE_INLINE void TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POAManager::AdapterInactive)) -{ - // Lock access to the POAManager for the duration of this transaction - TAO_OBJECT_ADAPTER_GUARD; + {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD; this->deactivate_i (etherealize_objects, wait_for_completion); } @@ -64,14 +48,12 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, ACE_INLINE PortableServer::POAManager::State TAO_POA_Manager::get_state_i (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return this->state_; } ACE_INLINE PortableServer::POAManager::State TAO_POA_Manager::get_state (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_); |