Changeset 9406 in orxonox.OLD for trunk/src/util/animation/animation_player.cc

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/util/animation/animation_player.cc (modified) (4 diffs)

trunk/src/util/animation/animation_player.cc

@@ -20 +20 @@
 #include "compiler.h"
 
-using namespace std;
+
 
 
@@ -100 +100 @@
   {
       // iterate through all the animations and tick them.
-    list<Animation*>::iterator anim;
+    std::list<Animation*>::iterator anim;
     for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
     {
@@ -135 +135 @@
 Animation* AnimationPlayer::getAnimationFromBaseObject(const BaseObject* baseObject) const
 {
-  list<Animation*>::const_iterator anim;
+  std::list<Animation*>::const_iterator anim;
   for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
     if((*anim)->getBaseObject() == baseObject)
@@ -156 +156 @@
   PRINT(0)("-Animation Information---------------+\n");
   // Per ANIMATION DEBUG
-  list<Animation*>::iterator anim;
+  std::list<Animation*>::iterator anim;
   for (anim = this->animationList.begin(); anim != this->animationList.end(); anim++)
     {