diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 1fd2e3cd945..f3afff015db 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -24,7 +24,7 @@ CC_LockSet::CC_LockSet (void) { ACE_TRY_NEW_ENV { - this->Init (ACE_TRY_ENV); + this->Init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -42,7 +42,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related) { ACE_TRY_NEW_ENV { - this->Init (ACE_TRY_ENV); + this->Init (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -56,7 +56,7 @@ CC_LockSet::CC_LockSet (CosConcurrencyControl::LockSet_ptr related) // Initialization. void -CC_LockSet::Init (CORBA::Environment &ACE_TRY_ENV) +CC_LockSet::Init (TAO_ENV_SINGLE_ARG_DECL) { // Set the mode of the statically allocated locks lock_[CC_IR] = 0; @@ -92,8 +92,8 @@ CORBA::Boolean CC_LockSet::compatible (CC_LockModeEnum mr) // Locks the lock in the desired mode. Blocks until success. void -CC_LockSet::lock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &ACE_TRY_ENV) +CC_LockSet::lock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "CC_LockSet::lock\n")); @@ -113,8 +113,8 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode, // Tries to lock. If it is not possible false is returned. CORBA::Boolean -CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &) +CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { CC_LockModeEnum lm = lmconvert (mode); @@ -154,8 +154,8 @@ CC_LockSet::lmconvert (CosConcurrencyControl::lock_mode mode) // Unlock the lock void -CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode, - CORBA::Environment &ACE_TRY_ENV) +CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)) { @@ -199,8 +199,8 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode, void CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, - CosConcurrencyControl::lock_mode new_mode, - CORBA::Environment &ACE_TRY_ENV) + CosConcurrencyControl::lock_mode new_mode + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosConcurrencyControl::LockNotHeld)) { @@ -213,7 +213,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode, ACE_THROW (CosConcurrencyControl::LockNotHeld()); else if (this->change_mode_i (lm_held, lm_new)==1) { - this->unlock (held_mode, ACE_TRY_ENV); + this->unlock (held_mode TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (semaphore_.acquire () == -1) |