summaryrefslogtreecommitdiff
path: root/TAO/tao/Abstract_Servant_Base.h
diff options
context:
space:
mode:
authorokellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-29 20:21:11 +0000
committerokellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-29 20:21:11 +0000
commit56681ffa90714cf82c32e907c0f80cea75166740 (patch)
treefd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/tao/Abstract_Servant_Base.h
parent6b5e98c78a7f66029147fad41e2e75cea35854aa (diff)
downloadATCD-56681ffa90714cf82c32e907c0f80cea75166740.tar.gz
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/tao/Abstract_Servant_Base.h')
-rw-r--r--TAO/tao/Abstract_Servant_Base.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h
index 9e7cf13aad7..760ffc1924c 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -37,27 +37,27 @@ public:
/// Local implementation of the CORBA::Object::_is_a method.
virtual CORBA::Boolean _is_a (const char* logical_type_id
- TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0;
/// Default <_non_existent>: always returns false.
- virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
+ virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0;
/// Query the Interface Repository.
virtual CORBA_InterfaceDef_ptr _get_interface (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
) = 0;
//@{
/// @name Reference counting hooks: no-ops by default.
- virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
- virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+ virtual void _remove_ref (ACE_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 (TAO_ENV_SINGLE_ARG_DECL) = 0;
+ virtual TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL) = 0;
protected:
/// Default constructor, only derived classes can be created.
@@ -78,12 +78,12 @@ protected:
*/
virtual void _dispatch (TAO_ServerRequest &request,
void *servant_upcall
- TAO_ENV_ARG_DECL) = 0;
+ ACE_ENV_ARG_DECL) = 0;
virtual void synchronous_upcall_dispatch (TAO_ServerRequest &req,
void *servant_upcall,
void *derived_this
- TAO_ENV_ARG_DECL) = 0;
+ ACE_ENV_ARG_DECL) = 0;
/// Find an operation in the operation table.
virtual int _find (const char *opname,