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

Deprecate unused return value of importPhase

Browse source
This commit is contained in:
Ray Speth 2014-10-03 22:15:08 +00:00
parent 6d4271fdfe
commit 55fab6ca83
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/cantera/thermo/ThermoFactory.h
View file

@ -227,6 +227,9 @@ ThermoPhase* newPhase(const std::string& infile, std::string id="");
* created.
*
* @ingroup thermoprops
*
* @deprecated: The return value of this function is always 'true'. After
* Cantera 2.2, this function will return 'void'.
*/
bool importPhase(XML_Node& phase, ThermoPhase* th, SpeciesThermoFactory* spfactory = 0);

6
src/thermo/HMWSoln_input.cpp
View file

@ -1125,11 +1125,7 @@ void HMWSoln::constructPhaseXML(XML_Node& phaseNode, std::string id_)
* all of the species into the phase. This will also handle
* all of the solvent and solute standard states
*/
bool m_ok = importPhase(phaseNode, this);
if (!m_ok) {
throw CanteraError("HMWSoln::constructPhaseXML","importPhase failed ");
}
importPhase(phaseNode, this);
}
void HMWSoln::initThermoXML(XML_Node& phaseNode, const std::string& id_)

7
src/thermo/IonsFromNeutralVPSSTP.cpp
View file

@ -282,12 +282,7 @@ void IonsFromNeutralVPSSTP::constructPhaseXML(XML_Node& phaseNode, std::string i
* all of the species into the phase. This will also handle
* all of the solvent and solute standard states
*/
bool m_ok = importPhase(phaseNode, this);
if (!m_ok) {
throw CanteraError("IonsFromNeutralVPSSTP::constructPhaseXML",
"importPhase failed ");
}
importPhase(phaseNode, this);
}
/*