Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11020 for code/trunk


Ignore:
Timestamp:
Jan 2, 2016, 9:08:54 PM (8 years ago)
Author:
landauf
Message:

fixed some cases where 'delete' was used instead of destroy()

Location:
code/trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/libraries/core/CoreIncludes.h

    r10624 r11020  
    229229                , identifier_(identifier)
    230230            {}
    231             ~StaticallyInitializedIdentifier() { delete identifier_; }
     231            ~StaticallyInitializedIdentifier() { identifier_->destroy(); }
    232232
    233233            virtual void load()
  • code/trunk/src/modules/objects/triggers/MultiTrigger.cc

    r9667 r11020  
    454454        this->fireEvent(status, container);
    455455        orxout(verbose, context::triggers) << "MultiTrigger '" <<  this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << endl;
    456         delete container;
     456        container->destroy();
    457457    }
    458458
  • code/trunk/src/modules/portals/PortalEndPoint.cc

    r9667 r11020  
    7171    {
    7272        if(this->isInitialized() && this->trigger_ != NULL)
    73             delete this->trigger_;
     73            this->trigger_->destroy();
    7474    }
    7575
  • code/trunk/src/orxonox/LevelManager.cc

    r10624 r11020  
    8080        std::set<LevelInfoItem*, LevelInfoCompare>::iterator it = availableLevels_.begin();
    8181        for (; it != availableLevels_.end(); ++it)
    82             delete *it;
     82            (*it)->destroy();
    8383    }
    8484
Note: See TracChangeset for help on using the changeset viewer.