diff options
author | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-02 02:32:10 +0000 |
---|---|---|
committer | fhunleth <fhunleth@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-02 02:32:10 +0000 |
commit | 7ed0821f86e4b70dc75e18c4c960e8d2d895c647 (patch) | |
tree | e6c4cb63722c260d6c229f938dc9a28800bf50ae /TAO/tao/ORB_Core.i | |
parent | 77f6a46a8d173c3c6b20065623ed1c50857d2afb (diff) | |
download | ATCD-7ed0821f86e4b70dc75e18c4c960e8d2d895c647.tar.gz |
ChangeLogTag: Thu Feb 1 20:29:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/ORB_Core.i')
-rw-r--r-- | TAO/tao/ORB_Core.i | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index e65471d8c8b..2a3b815aec1 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -4,7 +4,7 @@ ACE_INLINE CORBA::ULong TAO_ORB_Core::_incr_refcnt (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); return this->refcount_++; } @@ -12,7 +12,7 @@ ACE_INLINE CORBA::ULong TAO_ORB_Core::_decr_refcnt (void) { { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); this->refcount_--; if (this->refcount_ != 0) return this->refcount_; @@ -484,7 +484,7 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_typecodefactory (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->typecode_factory_)) { @@ -504,7 +504,7 @@ TAO_ORB_Core::typecode_factory (const CORBA::Object_ptr tf) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_dynanyfactory (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->dynany_factory_)) { @@ -517,7 +517,7 @@ TAO_ORB_Core::resolve_dynanyfactory (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_ior_manipulation (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->ior_manip_factory_)) { @@ -530,7 +530,7 @@ TAO_ORB_Core::resolve_ior_manipulation (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::resolve_ior_table (CORBA::Environment &ACE_TRY_ENV) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); if (CORBA::is_nil (this->ior_table_)) { @@ -577,14 +577,14 @@ TAO_ORB_Core::policy_current (void) ACE_INLINE CORBA::Object_ptr TAO_ORB_Core::poa_current (void) { - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->lock_, 0); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, 0); return CORBA::Object::_duplicate (this->poa_current_.in ()); } ACE_INLINE void TAO_ORB_Core::poa_current (CORBA::Object_ptr current) { - ACE_GUARD (ACE_SYNCH_MUTEX, mon, this->lock_); + ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); this->poa_current_ = CORBA::Object::_duplicate (current); } |