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

Comparing branches/new_design/OOPSE-3.0/src/brains/SimInfo.cpp (file contents):
Revision 1824 by tim, Thu Dec 2 03:12:25 2004 UTC vs.
Revision 1832 by tim, Thu Dec 2 16:04:19 2004 UTC

# Line 146 | Line 146 | bool SimInfo::addMolecule(Molecule* mol) {
146      i = molecules_.find(mol->getGlobalIndex());
147      if (i != molecules_.end() ) {
148  
149 <        molecules_.insert(make_pair(mol->getGlobalIndex(), mol));
149 >        molecules_.insert(std::make_pair(mol->getGlobalIndex(), mol));
150          
151          nAtoms_ += mol->getNAtoms();
152          nBonds_ += mol->getNBonds();
# Line 828 | Line 828 | std::ostream& operator <<(ostream& o, SimInfo& info) {
828      
829   }
830  
831 < std::ostream& operator <<(ostream& o, SimInfo& info) {
831 > std::ostream& operator <<(std::ostream& o, SimInfo& info) {
832  
833      return o;
834   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines