From 57bbde2ab200acede08411f091b608db2e3ca4ba Mon Sep 17 00:00:00 2001 From: David Rose Date: Sat, 13 Sep 2008 03:58:44 +0000 Subject: [PATCH] wait_pending should return void --- panda/src/chan/animControl.cxx | 2 +- panda/src/chan/animControl.h | 2 +- panda/src/chan/partBundle.cxx | 2 +- panda/src/chan/partBundle.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/chan/animControl.cxx b/panda/src/chan/animControl.cxx index 51c60108a3..44f014d289 100644 --- a/panda/src/chan/animControl.cxx +++ b/panda/src/chan/animControl.cxx @@ -115,7 +115,7 @@ AnimControl:: // Description: Blocks the current thread until the AnimControl has // finished loading and is fully bound. //////////////////////////////////////////////////////////////////// -bool AnimControl:: +void AnimControl:: wait_pending() { MutexHolder holder(_pending_lock); while (_pending) { diff --git a/panda/src/chan/animControl.h b/panda/src/chan/animControl.h index 6904973776..22c6343622 100644 --- a/panda/src/chan/animControl.h +++ b/panda/src/chan/animControl.h @@ -50,7 +50,7 @@ PUBLISHED: virtual ~AnimControl(); INLINE bool is_pending() const; - bool wait_pending(); + void wait_pending(); INLINE bool has_anim() const; void set_pending_done_event(const string &done_event); string get_pending_done_event() const; diff --git a/panda/src/chan/partBundle.cxx b/panda/src/chan/partBundle.cxx index 7e0ebec7a0..ad59adc384 100644 --- a/panda/src/chan/partBundle.cxx +++ b/panda/src/chan/partBundle.cxx @@ -369,7 +369,7 @@ load_bind_anim(Loader *loader, const Filename &filename, // AnimControls, with a nonzero control effect, have // been loaded and are properly bound. //////////////////////////////////////////////////////////////////// -bool PartBundle:: +void PartBundle:: wait_pending() { CDReader cdata(_cycler); ChannelBlend::const_iterator cbi; diff --git a/panda/src/chan/partBundle.h b/panda/src/chan/partBundle.h index 70cedafcea..758c1ff186 100644 --- a/panda/src/chan/partBundle.h +++ b/panda/src/chan/partBundle.h @@ -133,7 +133,7 @@ PUBLISHED: int hierarchy_match_flags, const PartSubset &subset, bool allow_async); - bool wait_pending(); + void wait_pending(); bool freeze_joint(const string &joint_name, const TransformState *transform); bool control_joint(const string &joint_name, PandaNode *node);