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

Fixed some compiler warnings

Browse source 
(shadowed virtual functions, initialization order)
This commit is contained in:
Ray Speth 2013-02-07 23:41:42 +00:00
parent 9010ecc644
commit dc1ffee1a2
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -406,7 +406,7 @@ public:
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void initThermoXML(const XML_Node& phaseNode, std::string& id);
virtual void initThermoXML(const XML_Node& phaseNode, const std::string& id);
//@}

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

@ -403,7 +403,7 @@ public:
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void initThermoXML(const XML_Node& phaseNode, std::string& id);
virtual void initThermoXML(const XML_Node& phaseNode, const std::string& id);
//! Initialization routine for all of the shallow pointers
/*!

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

@ -435,7 +435,7 @@ public:
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void initThermoXML(const XML_Node& phaseNode, std::string& id);
virtual void initThermoXML(const XML_Node& phaseNode, const std::string& id);
//! Initialization routine for all of the shallow pointers
/*!

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

@ -549,7 +549,7 @@ private:
* phase. If none is given, the first XML
* phase element will be used.
*/
virtual void initThermoXML(const XML_Node& phaseNode, std::string& id);
virtual void initThermoXML(const XML_Node& phaseNode, const std::string& id);
//@}

2
src/thermo/PDSS_ConstVol.cpp
View file

@ -186,7 +186,7 @@ void PDSS_ConstVol::constructPDSSFile(VPStandardStateTP* tp, size_t spindex,
delete fxml;
}
void PDSS_ConstVol::initThermoXML(const XML_Node& phaseNode, std::string& id)
void PDSS_ConstVol::initThermoXML(const XML_Node& phaseNode, const std::string& id)
{
PDSS::initThermoXML(phaseNode, id);
m_minTemp = m_spthermo->minTemp(m_spindex);

2
src/thermo/PDSS_IdealGas.cpp
View file

@ -147,7 +147,7 @@ void PDSS_IdealGas::constructPDSSFile(VPStandardStateTP* tp, size_t spindex,
delete fxml;
}
void PDSS_IdealGas::initThermoXML(const XML_Node& phaseNode, std::string& id)
void PDSS_IdealGas::initThermoXML(const XML_Node& phaseNode, const std::string& id)
{
PDSS::initThermoXML(phaseNode, id);
}

2
src/thermo/PDSS_IonsFromNeutral.cpp
View file

@ -261,7 +261,7 @@ void PDSS_IonsFromNeutral::constructPDSSFile(VPStandardStateTP* tp, size_t spind
delete fxml;
}
//=======================================================================================================
void PDSS_IonsFromNeutral::initThermoXML(const XML_Node& phaseNode, std::string& id)
void PDSS_IonsFromNeutral::initThermoXML(const XML_Node& phaseNode, const std::string& id)
{
PDSS::initThermoXML(phaseNode, id);
}

2
src/thermo/PDSS_SSVol.cpp
View file

@ -213,7 +213,7 @@ void PDSS_SSVol::constructPDSSFile(VPStandardStateTP* tp, size_t spindex,
delete fxml;
}
void PDSS_SSVol::initThermoXML(const XML_Node& phaseNode, std::string& id)
void PDSS_SSVol::initThermoXML(const XML_Node& phaseNode, const std::string& id)
{
PDSS::initThermoXML(phaseNode, id);
m_minTemp = m_spthermo->minTemp(m_spindex);

2
src/zeroD/FlowReactor.cpp
View file

@ -15,8 +15,8 @@ namespace Cantera
FlowReactor::FlowReactor() :
Reactor(),
m_fctr(1.0e10),
m_dist(0.0),
m_fctr(1.0e10),
m_speed0(0.0)
{
}