From 81caaa764b229585ac1fe09e18edee9822af6fd7 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 16 Mar 2012 20:27:05 +0000 Subject: [PATCH] all ConditionVar::wait() methods need to be BLOCKING --- panda/src/pipeline/conditionVarDebug.h | 4 ++-- panda/src/pipeline/conditionVarFullDebug.h | 4 ++-- panda/src/pipeline/conditionVarFullDirect.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/panda/src/pipeline/conditionVarDebug.h b/panda/src/pipeline/conditionVarDebug.h index f84034e1b8..8a5294b015 100644 --- a/panda/src/pipeline/conditionVarDebug.h +++ b/panda/src/pipeline/conditionVarDebug.h @@ -44,8 +44,8 @@ private: PUBLISHED: INLINE MutexDebug &get_mutex() const; - void wait(); - void wait(double timeout); + BLOCKING void wait(); + BLOCKING void wait(double timeout); void notify(); virtual void output(ostream &out) const; diff --git a/panda/src/pipeline/conditionVarFullDebug.h b/panda/src/pipeline/conditionVarFullDebug.h index dc9f5bed97..70518cf0fe 100644 --- a/panda/src/pipeline/conditionVarFullDebug.h +++ b/panda/src/pipeline/conditionVarFullDebug.h @@ -44,8 +44,8 @@ private: PUBLISHED: INLINE MutexDebug &get_mutex() const; - void wait(); - void wait(double timeout); + BLOCKING void wait(); + BLOCKING void wait(double timeout); void notify(); void notify_all(); virtual void output(ostream &out) const; diff --git a/panda/src/pipeline/conditionVarFullDirect.h b/panda/src/pipeline/conditionVarFullDirect.h index cc421e2413..7bf3a892a1 100644 --- a/panda/src/pipeline/conditionVarFullDirect.h +++ b/panda/src/pipeline/conditionVarFullDirect.h @@ -44,8 +44,8 @@ private: PUBLISHED: INLINE MutexDirect &get_mutex() const; - INLINE void wait(); - INLINE void wait(double timeout); + BLOCKING INLINE void wait(); + BLOCKING INLINE void wait(double timeout); INLINE void notify(); INLINE void notify_all(); void output(ostream &out) const;