diff options
Diffstat (limited to 'ace/Synch_T.i')
-rw-r--r-- | ace/Synch_T.i | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/ace/Synch_T.i b/ace/Synch_T.i index ef0f225af28..fefd739485d 100644 --- a/ace/Synch_T.i +++ b/ace/Synch_T.i @@ -258,10 +258,8 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void) } template <class ACE_LOCKING_MECHANISM> ACE_INLINE -ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock, - ACE_Acquire_Method::METHOD_TYPE acquire_method) - : lock_ (lock), - acquire_method_ (acquire_method) +ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock) + : lock_ (lock) { } @@ -283,54 +281,49 @@ ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire (void) template <class ACE_LOCKING_MECHANISM> ACE_INLINE int ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire (void) { - ACE_NOTSUP_RETURN (-1); + return this->lock_.tryacquire (); } // Acquire the lock. template <class ACE_LOCKING_MECHANISM> ACE_INLINE int ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::release (void) { - if (this->acquire_method_ == ACE_Acquire_Method::ACE_READ) - return this->lock_.acquire_read (); - else if (this->acquire_method_ == ACE_Acquire_Method::ACE_WRITE) - return this->lock_.acquire_write (); - else - return this->lock_.acquire (); + return this->lock_.acquire (); } // Release the lock. template <class ACE_LOCKING_MECHANISM> ACE_INLINE int ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_read (void) { - ACE_NOTSUP_RETURN (-1); + return this->lock_.acquire_read (); } // Release the lock. template <class ACE_LOCKING_MECHANISM> ACE_INLINE int ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::acquire_write (void) { - ACE_NOTSUP_RETURN (-1); + return this->lock_.acquire_write (); } // Release the lock. template <class ACE_LOCKING_MECHANISM> ACE_INLINE int ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_read (void) { - ACE_NOTSUP_RETURN (-1); + return this->lock_.tryacquire_read (); } // Release the lock. template <class ACE_LOCKING_MECHANISM> ACE_INLINE int ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write (void) { - ACE_NOTSUP_RETURN (-1); + return this->lock_.tryacquire_write (); } // Release the lock. template <class ACE_LOCKING_MECHANISM> ACE_INLINE int ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire_write_upgrade (void) { - ACE_NOTSUP_RETURN (-1); + return this->lock_.tryacquire_write_upgrade (); } #if defined (ACE_HAS_THREADS) |