Changeset 5798 for code/branches/core5/src/libraries

Timestamp:

Sep 26, 2009, 10:18:24 PM (15 years ago)

Author:

landauf

Message:

replaced delete with destroy() in tools

Location:

code/branches/core5/src/libraries/tools

Files:

• Timer.cc (modified) (4 diffs)
• Timer.h (modified) (1 diff)

code/branches/core5/src/libraries/tools/Timer.cc

@@ -67 +67 @@
     {
         CommandExecutor::execute(command);
-        delete timer;
+        timer->destroy();
         delaytimerset.erase(timer);
     }
@@ -77 +77 @@
     {
         for (std::set<StaticTimer*>::iterator it = delaytimerset.begin(); it != delaytimerset.end(); ++it)
-            delete (*it);
+            (*it)->destroy();
 
         delaytimerset.clear();
@@ -109 +109 @@
         @brief Executes the executor.
     */
-    void TimerBase::run() const
+    void TimerBase::run()
     {
         bool temp = this->bKillAfterCall_; // to avoid errors with bKillAfterCall_=false and an exutors which destroy the timer
@@ -116 +116 @@
 
         if (temp)
-            delete this;
+            this->destroy();
     }
 

code/branches/core5/src/libraries/tools/Timer.h

@@ -80 +80 @@
             ~TimerBase();
 
-            void run() const;
+            void run();
             void deleteExecutor();