1 files changed, 10 insertions, 33 deletions

diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl
index c8bcd0e7c50..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 ();
 }
@@ -27,56 +23,37 @@ TAO_POA_Manager::activate (void)
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 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;
+TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion)
+  {// 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;
+TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion)
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
   this->discard_requests_i (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;
+                             CORBA::Boolean wait_for_completion)
+  {// Lock access to the POAManager for the duration of this transactionTAO_OBJECT_ADAPTER_GUARD;
 
-  this->deactivate_i (etherealize_objects,
-                      wait_for_completion
-                     );
+  this->deactivate_i (etherealize_objects, wait_for_completion);
 }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 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_);
@@ -131,7 +108,7 @@ TAO_POA_Manager::generate_manager_id (void) const
 #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO)
 
 ACE_INLINE
-CORBA::PolicyList& TAO_POA_Manager::get_policies ()
+CORBA::PolicyList& TAO_POA_Manager::get_policies (void)
 {
   return this->policies_;
 }