aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-05-05 21:46:54 +0200
committerMachiavelli <none@none>2010-05-05 21:46:54 +0200
commit62dc83981939800d9b784c4acfd6d9b491dc6055 (patch)
tree34e41ce8a6a034396c1c001c186ec0ca005c9101
parent6ead23e3537d5a658237590bcc1b871ac2ad4af7 (diff)
Use ACE_GUARD_RETURN macro in LockedQueue::next to guarrantee the lock is acquired before changing the queue´s properties
--HG-- branch : trunk
-rw-r--r--src/shared/LockedQueue.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/LockedQueue.h b/src/shared/LockedQueue.h
index c07ffcacb02..fd0a0d5d22d 100644
--- a/src/shared/LockedQueue.h
+++ b/src/shared/LockedQueue.h
@@ -68,7 +68,8 @@ namespace ACE_Based
//! Gets the next result in the queue, if any.
bool next(T& result)
{
- ACE_Guard<LockType> g(this->_lock);
+ // ACE_Guard<LockType> g(this->_lock);
+ ACE_GUARD_RETURN (LockType, g, this->_lock, false);
if (_queue.empty())
return false;