ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/FAS/src/extradata.cpp
(Generate patch)

Comparing trunk/FAS/src/extradata.cpp (file contents):
Revision 66 by tim, Tue Aug 13 16:02:26 2002 UTC vs.
Revision 67 by tim, Tue Aug 13 17:07:15 2002 UTC

# Line 14 | Line 14 | TExtraData &TExtraData::operator =(const TExtraData ex
14          _type = extraData._type;
15   }
16  
17 < TExtraData &TExtraData::operator =(const TExtraData extraData)
17 > TExtraData &TExtraData::operator =(const TExtraData &extraData)
18   {
19          if (this == &extraData)
20                  return *this;
21                  
22 <        _indet = extraData._ident;
22 >        _ident = extraData._ident;
23          _type = extraData._type;
24          return *this;
25   }
# Line 36 | Line 36 | TEnergyData &TEnergyData::operator =(TEnergyData &ener
36          _energy = energyData._energy;  
37   }
38  
39 < TEnergyData &TEnergyData::operator =(TEnergyData &energyData)
39 > TEnergyData &TEnergyData::operator =(const TEnergyData &energyData)
40   {
41          if (this == &energyData)
42                  return *this;
43 <        TExtraData::operator =(enrgyData);
44 <        _energy = energyDataType._energy;      
43 >        TExtraData::operator =(energyData);
44 >        _energy = energyData._energy;  
45   }
46  
47   TEnergyData::~TEnergyData()
# Line 51 | Line 51 | map<int, float>::iterator TEnergyData::FindEnergy(int
51  
52   map<int, float>::iterator TEnergyData::FindEnergy(int energyType)
53   {
54 <        return find(_energy.begin(), _energy.end(), energyType);
54 >        return _energy.find(energyType);
55   }
56  
57   void TEnergyData::AddEnergy(int energyType, float value)
# Line 66 | Line 66 | void TEnergyData::ReplaceEnergy(int energyType, float
66          
67          if (i != _energy.end())
68          {
69 <                *i = value;
69 >                (*i).second = value;
70          }      
71   }
72  
# Line 89 | Line 89 | float *TEnergyData::GetEnergy(int energyType)
89  
90          if (i != _energy.end())
91          {
92 <                return *i;
92 >                return &((*i).second);
93          }
94          else
95          {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines