diff options
Diffstat (limited to 'TAO/tao/PortableServer/ServantRetentionStrategy.h')
| -rw-r--r-- | TAO/tao/PortableServer/ServantRetentionStrategy.h | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 41ffc3ef013..f1b1de2de9b 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -65,9 +65,7 @@ namespace TAO CORBA::Short priority, bool &wait_occurred_restart_call ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; #if !defined (CORBA_E_MICRO) virtual void activate_object_with_id ( @@ -76,10 +74,7 @@ namespace TAO CORBA::Short priority, bool &wait_occurred_restart_call ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantAlreadyActive, - PortableServer::POA::ObjectAlreadyActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; #endif virtual void deactivate_object (const PortableServer::ObjectId &id @@ -92,56 +87,44 @@ 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)) = 0; + = 0; virtual PortableServer::Servant user_id_to_servant ( const PortableServer::ObjectId &id ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual CORBA::Object_ptr id_to_reference ( const PortableServer::ObjectId &id, bool indirect ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ObjectNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual void deactivate_all_objects (void) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual CORBA::Object_ptr servant_to_reference ( PortableServer::Servant servant ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::ServantNotActive, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual CORBA::Object_ptr create_reference ( const char *intf, CORBA::Short priority ) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableServer::POA::WrongPolicy)) = 0; + = 0; virtual CORBA::Object_ptr create_reference_with_id ( const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority ) - ACE_THROW_SPEC ((CORBA::SystemException)) = 0; + = 0; virtual int rebind_using_user_id_and_system_id ( PortableServer::Servant servant, |