ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/brains/SimInfo.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/brains/SimInfo.cpp (file contents):
Revision 2015 by tim, Sun Feb 13 21:18:27 2005 UTC vs.
Revision 2082 by tim, Mon Mar 7 22:39:33 2005 UTC

# Line 144 | Line 144 | SimInfo::~SimInfo() {
144   }
145  
146   SimInfo::~SimInfo() {
147 <    //MemoryUtils::deleteVectorOfPointer(molecules_);
148 <
149 <    MemoryUtils::deleteVectorOfPointer(moleculeStamps_);
147 >    std::map<int, Molecule*>::iterator i;
148 >    for (i = molecules_.begin(); i != molecules_.end(); ++i) {
149 >        delete i->second;
150 >    }
151 >    molecules_.clear();
152 >    
153 >    MemoryUtils::deletePointers(moleculeStamps_);
154      
155      delete sman_;
156      delete simParams_;
# Line 835 | Line 839 | void SimInfo::setSnapshotManager(SnapshotManager* sman
839   }
840  
841   void SimInfo::setSnapshotManager(SnapshotManager* sman) {
842 <    if (sman_ == sman_) {
843 <        return;
844 <    }
842 >    //if (sman_ == sman_) {
843 >    //    return;
844 >    //}
845      
846 <    delete sman_;
846 >    //delete sman_;
847      sman_ = sman;
848  
849      Molecule* mol;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines