diff options
Diffstat (limited to 'TAO/tao/Abstract_Servant_Base.h')
| -rw-r--r-- | TAO/tao/Abstract_Servant_Base.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h index 126290e6801..9e7cf13aad7 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -36,32 +36,28 @@ public: virtual ~TAO_Abstract_ServantBase (void); /// Local implementation of the CORBA::Object::_is_a method. - virtual CORBA::Boolean _is_a (const char* logical_type_id, - CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()) = 0; + virtual CORBA::Boolean _is_a (const char* logical_type_id + TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; /// Default <_non_existent>: always returns false. - virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()) = 0; + virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; /// Query the Interface Repository. virtual CORBA_InterfaceDef_ptr _get_interface ( - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment () + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS ) = 0; //@{ /// @name Reference counting hooks: no-ops by default. - virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); - virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = - TAO_default_environment ()); + virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); //@} /// Get the correct vtable. virtual void *_downcast (const char *repository_id) = 0; /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV) = 0; + virtual TAO_Stub *_create_stub (TAO_ENV_SINGLE_ARG_DECL) = 0; protected: /// Default constructor, only derived classes can be created. @@ -81,13 +77,13 @@ protected: * any) or the exceptions thrown into @param request. */ virtual void _dispatch (TAO_ServerRequest &request, - void *servant_upcall, - CORBA_Environment &ACE_TRY_ENV) = 0; + void *servant_upcall + TAO_ENV_ARG_DECL) = 0; virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req, void *servant_upcall, - void *derived_this, - CORBA::Environment &ACE_TRY_ENV) = 0; + void *derived_this + TAO_ENV_ARG_DECL) = 0; /// Find an operation in the operation table. virtual int _find (const char *opname, |