diff options
Diffstat (limited to 'TAO/tao/RTPortableServer/RTPortableServerC.h')
| -rw-r--r-- | TAO/tao/RTPortableServer/RTPortableServerC.h | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index b4ef0ad232e..8b5a9cc1b75 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -98,7 +98,7 @@ TAO_NAMESPACE RTPortableServer static POA_ptr tao_duplicate (POA_ptr); static void tao_release (POA_ptr); static POA_ptr tao_nil (void); - static POA_ptr tao_narrow (CORBA::Object *, CORBA::Environment &); + static POA_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: @@ -152,15 +152,13 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA // the static operations static POA_ptr _duplicate (POA_ptr obj); static POA_ptr _narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + static POA_ptr _unchecked_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + static POA_ptr _nil (void) { return (POA_ptr)0; @@ -168,10 +166,9 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA virtual CORBA::Object_ptr create_reference_with_priority ( const char * intf, - RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + RTCORBA::Priority priority + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::POA::WrongPolicy @@ -180,10 +177,9 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA virtual CORBA::Object_ptr create_reference_with_id_and_priority ( const PortableServer::ObjectId & oid, const char * intf, - RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + RTCORBA::Priority priority + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::POA::WrongPolicy @@ -191,10 +187,9 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA virtual PortableServer::ObjectId * activate_object_with_priority ( PortableServer::Servant p_servant, - RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + RTCORBA::Priority priority + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, @@ -204,10 +199,9 @@ class TAO_RTPortableServer_Export POA: public virtual PortableServer::POA virtual void activate_object_with_id_and_priority ( const PortableServer::ObjectId & oid, PortableServer::Servant p_servant, - RTCORBA::Priority priority, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + RTCORBA::Priority priority + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, PortableServer::POA::ServantAlreadyActive, |