research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Thermo] Phase::addSpecies takes shared_ptr by value

Browse source 
This helps to clarify that addSpecies stores a copy of the shared_ptr.
This commit is contained in:
Ray Speth 2015-04-18 11:39:59 -04:00
parent a63874e4b4
commit a471e4316a
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cantera/thermo/Phase.h
View file

@ -761,7 +761,7 @@ public:
//! Add a Species to this Phase. Returns `true` if the species was
//! successfully added, or `false` if the species was ignored.
//! @see ignoreUndefinedElements addUndefinedElements throwUndefinedElements
virtual bool addSpecies(shared_ptr<Species>& spec);
virtual bool addSpecies(shared_ptr<Species> spec);
void addSpecies(const std::string& name, const doublereal* comp,
doublereal charge = 0.0, doublereal size = 1.0);

2
include/cantera/thermo/ThermoPhase.h
View file

@ -1310,7 +1310,7 @@ public:
//@{
using Phase::addSpecies;
virtual bool addSpecies(shared_ptr<Species>& spec);
virtual bool addSpecies(shared_ptr<Species> spec);
//! Store a reference pointer to the XML tree containing the species data
//! for this phase.

2
src/thermo/Phase.cpp
View file

@ -837,7 +837,7 @@ size_t Phase::addUniqueElementAfterFreeze(const std::string& symbol,
return addElement(symbol, weight, atomicNumber, entropy298, elem_type);
}
bool Phase::addSpecies(shared_ptr<Species>& spec) {
bool Phase::addSpecies(shared_ptr<Species> spec) {
m_species[spec->name] = spec;
vector_fp comp(nElements());
for (map<string, double>::const_iterator iter = spec->composition.begin();

2
src/thermo/ThermoPhase.cpp
View file

@ -694,7 +694,7 @@ void ThermoPhase::installSlavePhases(Cantera::XML_Node* phaseNode)
{
}
bool ThermoPhase::addSpecies(shared_ptr<Species>& spec)
bool ThermoPhase::addSpecies(shared_ptr<Species> spec)
{
bool added = Phase::addSpecies(spec);
if (added) {