Changeset 11020

Timestamp:

Jan 2, 2016, 9:08:54 PM (9 years ago)

Author:

landauf

Message:

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

Location:

code/trunk/src

Files:

• libraries/core/CoreIncludes.h (modified) (1 diff)
• modules/objects/triggers/MultiTrigger.cc (modified) (1 diff)
• modules/portals/PortalEndPoint.cc (modified) (1 diff)
• orxonox/LevelManager.cc (modified) (1 diff)

code/trunk/src/libraries/core/CoreIncludes.h

@@ -229 +229 @@
                 , identifier_(identifier)
             {}
-            ~StaticallyInitializedIdentifier() { delete identifier_; }
+            ~StaticallyInitializedIdentifier() { identifier_->destroy(); }
 
             virtual void load()

code/trunk/src/modules/objects/triggers/MultiTrigger.cc

@@ -454 +454 @@
         this->fireEvent(status, container);
         orxout(verbose, context::triggers) << "MultiTrigger '" <<  this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << endl;
-        delete container;
+        container->destroy();
     }
 

code/trunk/src/modules/portals/PortalEndPoint.cc

@@ -71 +71 @@
     {
         if(this->isInitialized() && this->trigger_ != NULL)
-            delete this->trigger_;
+            this->trigger_->destroy();
     }
 

code/trunk/src/orxonox/LevelManager.cc

@@ -80 +80 @@
         std::set<LevelInfoItem*, LevelInfoCompare>::iterator it = availableLevels_.begin();
         for (; it != availableLevels_.end(); ++it)
-            delete *it;
+            (*it)->destroy();
     }