Changeset 11018 for code/trunk/src/modules

Timestamp:

Jan 2, 2016, 8:59:12 PM (9 years ago)

Author:

landauf

Message:

I think it's sufficient if Timer is a Listable. A timer is often used as a member object in other classes, so it's probably a bad idea to make it a Destroyable since it will neither be deleted with destroy() nor will it survive the lifespan of its parent even if a StrongPtr references it.

File:

• code/trunk/src/modules/pong/PongAI.cc (modified) (2 diffs)

code/trunk/src/modules/pong/PongAI.cc

@@ -78 +78 @@
     {
         for (std::list<std::pair<Timer*, char> >::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it)
-            it->first->destroy();
+            delete it->first;
     }
 
@@ -380 +380 @@
 
         // Destroy the timer and remove it from the list
-        Timer* timer = this->reactionTimers_.front().first;
-        timer->destroy();
-
+        delete this->reactionTimers_.front().first;
         this->reactionTimers_.pop_front();
     }