summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorAndrew Stitcher <astitcher@apache.org>2011-04-11 21:47:07 +0000
committerAndrew Stitcher <astitcher@apache.org>2011-04-11 21:47:07 +0000
commit7a91aabcfa58ee847b0d067f65ef5fab62c467ee (patch)
treeb1c6f8fd7b21e5a7ca2041f53a6a66f5ea539865 /cpp/src
parent59be3220a6de6388badc85189e8bf6f5b454f981 (diff)
downloadqpid-python-7a91aabcfa58ee847b0d067f65ef5fab62c467ee.tar.gz
QPID-3199: Locking error qpid::sys::StateMonitor
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1091224 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/sys/StateMonitor.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/qpid/sys/StateMonitor.h b/cpp/src/qpid/sys/StateMonitor.h
index 5a92756f3a..b74195fb8d 100644
--- a/cpp/src/qpid/sys/StateMonitor.h
+++ b/cpp/src/qpid/sys/StateMonitor.h
@@ -60,13 +60,13 @@ class StateMonitor : public Waitable
operator Enum() const { return state; }
/** @pre Caller holds a ScopedLock */
- void waitFor(Enum s) { ScopedWait(*this); while (s != state) wait(); }
+ void waitFor(Enum s) { ScopedWait w(*this); while (s != state) wait(); }
/** @pre Caller holds a ScopedLock */
- void waitFor(Set s) { ScopedWait(*this); while (!s.test(state)) wait(); }
+ void waitFor(Set s) { ScopedWait w(*this); while (!s.test(state)) wait(); }
/** @pre Caller holds a ScopedLock */
- void waitNot(Enum s) { ScopedWait(*this); while (s == state) wait(); }
+ void waitNot(Enum s) { ScopedWait w(*this); while (s == state) wait(); }
/** @pre Caller holds a ScopedLock */
- void waitNot(Set s) { ScopedWait(*this); while (s.test(state)) wait(); }
+ void waitNot(Set s) { ScopedWait w(*this); while (s.test(state)) wait(); }
private:
Enum state;