fixes according to code review.

2 files changed, 6 insertions, 7 deletions

diff --git a/anim/controller.cpp b/anim/controller.cpp
index 3e347cd4d8..9e246da4c2 100644
--- a/anim/controller.cpp
+++ b/anim/controller.cpp
@@ -1,6 +1,7 @@
 #include "controller.hpp"
 #include "task.hpp"
 
+#include "../base/assert.hpp"
 #include "../base/timer.hpp"
 #include "../std/bind.hpp"
 
@@ -20,7 +21,7 @@ namespace anim
     m_tasks.PushBack(task);
   }
 
-  void Controller::CopyTasks(TTasks & from, TTasks & to)
+  void Controller::CopyAndClearTasks(TTasks & from, TTasks & to)
   {
     to.clear();
     swap(from, to);
@@ -43,15 +44,13 @@ namespace anim
 
   int Controller::LockCount()
   {
-    if (m_LockCount < 0)
-      LOG(LWARNING, ("Lock/Unlock is unbalanced! LockCount < 0!"));
-
+    ASSERT(m_LockCount >=0, ("Lock/Unlock is unbalanced! LockCount < 0!"));
     return m_LockCount;
   }
 
   void Controller::PerformStep()
   {
-    m_tasks.ProcessList(bind(&Controller::CopyTasks, this, _1, ref(m_tasksList)));
+    m_tasks.ProcessList(bind(&Controller::CopyAndClearTasks, _1, ref(m_tasksList)));
 
     double ts = my::Timer::LocalTime();
 
@@ -76,6 +75,6 @@ namespace anim
       }
     }
 
-    m_tasks.ProcessList(bind(&Controller::CopyTasks, this, ref(l), _1));
+    m_tasks.ProcessList(bind(&Controller::CopyAndClearTasks, ref(l), _1));
   }
 }
diff --git a/anim/controller.hpp b/anim/controller.hpp
index a46c9032c9..b93b19b71e 100644
--- a/anim/controller.hpp
+++ b/anim/controller.hpp
@@ -23,7 +23,7 @@ namespace anim
 
     int m_LockCount;
 
-    void CopyTasks(list<shared_ptr<Task> > & from, list<shared_ptr<Task> > & to);
+    static void CopyAndClearTasks(list<shared_ptr<Task> > & from, list<shared_ptr<Task> > & to);
 
   public:
     // Constructor