diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-14 21:12:37 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-05-14 21:12:37 +0000 |
| commit | f903b1b284250cd7e84e60db2b10b1124bd72476 (patch) | |
| tree | ddbd5ce81a96273286a816cbece87a0e70d680ef /ace/Message_Queue_T.cpp | |
| parent | cebcd2fbb5dba59250390ef3c0cbe7ff965004a7 (diff) | |
| download | ATCD-f903b1b284250cd7e84e60db2b10b1124bd72476.tar.gz | |
replaced raw ACE_Read_Guards with ACE_READ_GUARD_RETURN macros. That
avoids a compiler warning (egcs 1.1.1/SunOS 5.7) now that the
ACE_Guard<Null_Mutex> destructor has been removed. Thanks to Irfan
and Carlos for suggesting this fix.
Diffstat (limited to 'ace/Message_Queue_T.cpp')
| -rw-r--r-- | ace/Message_Queue_T.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp index fa4bd8951d2..af6b0566538 100644 --- a/ace/Message_Queue_T.cpp +++ b/ace/Message_Queue_T.cpp @@ -39,7 +39,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::ACE_Message_Queue_Iterator (ACE_Messa template <ACE_SYNCH_DECL> int ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&entry) { - ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_); + ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) if (this->curr_ != 0) { @@ -53,7 +53,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&entry) template <ACE_SYNCH_DECL> int ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::done (void) const { - ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_); + ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) return this->curr_ == 0; } @@ -61,7 +61,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::done (void) const template <ACE_SYNCH_DECL> int ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::advance (void) { - ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_); + ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) if (this->curr_) this->curr_ = this->curr_->next (); @@ -90,7 +90,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::ACE_Message_Queue_Reverse_Ite template <ACE_SYNCH_DECL> int ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&entry) { - ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_); + ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) if (this->curr_ != 0) { @@ -104,7 +104,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&ent template <ACE_SYNCH_DECL> int ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::done (void) const { - ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_); + ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) return this->curr_ == 0; } @@ -112,7 +112,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::done (void) const template <ACE_SYNCH_DECL> int ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::advance (void) { - ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_); + ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1) if (this->curr_) this->curr_ = this->curr_->prev (); |