소스 검색

wait_pending should return void

David Rose 17 년 전
부모
커밋
57bbde2ab2
4개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      panda/src/chan/animControl.cxx
  2. 1 1
      panda/src/chan/animControl.h
  3. 1 1
      panda/src/chan/partBundle.cxx
  4. 1 1
      panda/src/chan/partBundle.h

+ 1 - 1
panda/src/chan/animControl.cxx

@@ -115,7 +115,7 @@ AnimControl::
 //  Description: Blocks the current thread until the AnimControl has
 //  Description: Blocks the current thread until the AnimControl has
 //               finished loading and is fully bound.
 //               finished loading and is fully bound.
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
-bool AnimControl::
+void AnimControl::
 wait_pending() {
 wait_pending() {
   MutexHolder holder(_pending_lock);
   MutexHolder holder(_pending_lock);
   while (_pending) {
   while (_pending) {

+ 1 - 1
panda/src/chan/animControl.h

@@ -50,7 +50,7 @@ PUBLISHED:
   virtual ~AnimControl();
   virtual ~AnimControl();
 
 
   INLINE bool is_pending() const;
   INLINE bool is_pending() const;
-  bool wait_pending();
+  void wait_pending();
   INLINE bool has_anim() const;
   INLINE bool has_anim() const;
   void set_pending_done_event(const string &done_event);
   void set_pending_done_event(const string &done_event);
   string get_pending_done_event() const;
   string get_pending_done_event() const;

+ 1 - 1
panda/src/chan/partBundle.cxx

@@ -369,7 +369,7 @@ load_bind_anim(Loader *loader, const Filename &filename,
 //               AnimControls, with a nonzero control effect, have
 //               AnimControls, with a nonzero control effect, have
 //               been loaded and are properly bound.
 //               been loaded and are properly bound.
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
-bool PartBundle::
+void PartBundle::
 wait_pending() {
 wait_pending() {
   CDReader cdata(_cycler);
   CDReader cdata(_cycler);
   ChannelBlend::const_iterator cbi;
   ChannelBlend::const_iterator cbi;

+ 1 - 1
panda/src/chan/partBundle.h

@@ -133,7 +133,7 @@ PUBLISHED:
                                  int hierarchy_match_flags,
                                  int hierarchy_match_flags,
                                  const PartSubset &subset,
                                  const PartSubset &subset,
                                  bool allow_async);
                                  bool allow_async);
-  bool wait_pending();
+  void wait_pending();
 
 
   bool freeze_joint(const string &joint_name, const TransformState *transform);
   bool freeze_joint(const string &joint_name, const TransformState *transform);
   bool control_joint(const string &joint_name, PandaNode *node);
   bool control_joint(const string &joint_name, PandaNode *node);