Changeset 5821 for code/branches/core5/src/libraries
- Timestamp:
- Sep 28, 2009, 3:56:30 PM (15 years ago)
- Location:
- code/branches/core5/src/libraries/core
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core5/src/libraries/core/BaseObject.cc
r5738 r5821 99 99 it->first->removeEvent(this); 100 100 101 for (std::map<std::string, EventContainer*>::const_iterator it = this->eventContainers_.begin(); it != this->eventContainers_.end(); ++it) 102 delete it->second; 103 101 104 if (this->functorSetMainState_) 102 105 delete this->functorSetMainState_; … … 146 149 147 150 XMLPortClassObjectContainer<BaseObject, BaseObject>* container = 0; 148 container = (XMLPortClassObjectContainer<BaseObject, BaseObject>*)(this->getIdentifier()->getXMLPortEventContainer(sectionname));151 container = static_cast<XMLPortClassObjectContainer<BaseObject, BaseObject>*>(this->getIdentifier()->getXMLPortEventContainer(sectionname)); 149 152 if (!container) 150 153 { -
code/branches/core5/src/libraries/core/ClassTreeMask.cc
r5738 r5821 488 488 489 489 // Remove the redundant subnode from the current node 490 delete (*it); 490 491 node->subnodes_.erase(it++); 491 492 } -
code/branches/core5/src/libraries/core/Identifier.cc
r5796 r5821 88 88 for (std::map<std::string, XMLPortObjectContainer*>::iterator it = this->xmlportObjectContainers_.begin(); it != this->xmlportObjectContainers_.end(); ++it) 89 89 delete (it->second); 90 for (std::map<std::string, XMLPortObjectContainer*>::iterator it = this->xmlportEventContainers_.begin(); it != this->xmlportEventContainers_.end(); ++it) 91 delete (it->second); 90 92 } 91 93
Note: See TracChangeset
for help on using the changeset viewer.