Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5798


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core5/src/libraries/tools/Timer.cc

    r5738 r5798  
    6767    {
    6868        CommandExecutor::execute(command);
    69         delete timer;
     69        timer->destroy();
    7070        delaytimerset.erase(timer);
    7171    }
     
    7777    {
    7878        for (std::set<StaticTimer*>::iterator it = delaytimerset.begin(); it != delaytimerset.end(); ++it)
    79             delete (*it);
     79            (*it)->destroy();
    8080
    8181        delaytimerset.clear();
     
    109109        @brief Executes the executor.
    110110    */
    111     void TimerBase::run() const
     111    void TimerBase::run()
    112112    {
    113113        bool temp = this->bKillAfterCall_; // to avoid errors with bKillAfterCall_=false and an exutors which destroy the timer
     
    116116
    117117        if (temp)
    118             delete this;
     118            this->destroy();
    119119    }
    120120
  • code/branches/core5/src/libraries/tools/Timer.h

    r5791 r5798  
    8080            ~TimerBase();
    8181
    82             void run() const;
     82            void run();
    8383            void deleteExecutor();
    8484
Note: See TracChangeset for help on using the changeset viewer.