diff options
Diffstat (limited to 'TAO/tao/PortableServer/ServantRetentionStrategyRetain.h')
| -rw-r--r-- | TAO/tao/PortableServer/ServantRetentionStrategyRetain.h | 52 |
1 files changed, 11 insertions, 41 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 4ea03f1fa3f..ca8dd792244 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -48,10 +48,7 @@ namespace TAO activate_object (PortableServer::Servant servant, CORBA::Short priority, bool &wait_occurred_restart_call - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)); + ); #if !defined (CORBA_E_MICRO) virtual @@ -59,11 +56,7 @@ namespace TAO activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, - bool &wait_occurred_restart_call) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)); + bool &wait_occurred_restart_call); #endif void deactivate_object (const PortableServer::ObjectId &id); @@ -73,23 +66,14 @@ namespace TAO ); virtual PortableServer::ObjectId * system_id_to_object_id ( - const PortableServer::ObjectId &system_id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongAdapter, - PortableServer::POA::WrongPolicy)); + const PortableServer::ObjectId &system_id); virtual PortableServer::Servant - user_id_to_servant (const PortableServer::ObjectId &id) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + user_id_to_servant (const PortableServer::ObjectId &id); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id, - bool indirect) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)); + bool indirect); virtual TAO_SERVANT_LOCATION @@ -106,40 +90,29 @@ namespace TAO CORBA::Short &priority ); - virtual void deactivate_all_objects (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + virtual void deactivate_all_objects (void); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant servant - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual CORBA::Object_ptr create_reference ( const char *intf, CORBA::Short priority - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)); + ); virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority - ) - ACE_THROW_SPEC ((CORBA::SystemException)); + ); virtual ::PortableServer::ServantRetentionPolicyValue type() const; @@ -158,10 +131,7 @@ namespace TAO PortableServer::Servant p_servant, CORBA::Short &priority - ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)); + ); virtual int rebind_using_user_id_and_system_id ( |