Changeset 5821 for code/branches/core5/src/libraries/core/BaseObject.cc

Timestamp:

Sep 28, 2009, 3:56:30 PM (16 years ago)

Author:

rgrieder

Message:

Fixed 3 memory leaks (one of them was a true even a true one )

• XMLPortObjectContainers as XMLPort event containers were not deleted in the identifier
• EventContainers were not deleted in the BaseObject
• ClassTreeMask clean() operation only erased redundant subnodes instead of deleting them as well

File:

• code/branches/core5/src/libraries/core/BaseObject.cc (modified) (2 diffs)

code/branches/core5/src/libraries/core/BaseObject.cc

@@ -99 +99 @@
                 it->first->removeEvent(this);
 
+            for (std::map<std::string, EventContainer*>::const_iterator it = this->eventContainers_.begin(); it != this->eventContainers_.end(); ++it)
+                delete it->second;
+
             if (this->functorSetMainState_)
                 delete this->functorSetMainState_;
@@ -146 +149 @@
 
                 XMLPortClassObjectContainer<BaseObject, BaseObject>* container = 0;
-                container = (XMLPortClassObjectContainer<BaseObject, BaseObject>*)(this->getIdentifier()->getXMLPortEventContainer(sectionname));
+                container = static_cast<XMLPortClassObjectContainer<BaseObject, BaseObject>*>(this->getIdentifier()->getXMLPortEventContainer(sectionname));
                 if (!container)
                 {