From dc1ffee1a23749c225652cb855dbe12c385ce5b9 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Thu, 7 Feb 2013 23:41:42 +0000 Subject: [PATCH] Fixed some compiler warnings (shadowed virtual functions, initialization order) --- include/cantera/thermo/PDSS_ConstVol.h | 2 +- include/cantera/thermo/PDSS_IdealGas.h | 2 +- include/cantera/thermo/PDSS_IonsFromNeutral.h | 2 +- include/cantera/thermo/PDSS_SSVol.h | 2 +- src/thermo/PDSS_ConstVol.cpp | 2 +- src/thermo/PDSS_IdealGas.cpp | 2 +- src/thermo/PDSS_IonsFromNeutral.cpp | 2 +- src/thermo/PDSS_SSVol.cpp | 2 +- src/zeroD/FlowReactor.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/cantera/thermo/PDSS_ConstVol.h b/include/cantera/thermo/PDSS_ConstVol.h index a64c1be46..d0bc33a03 100644 --- a/include/cantera/thermo/PDSS_ConstVol.h +++ b/include/cantera/thermo/PDSS_ConstVol.h @@ -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); //@} diff --git a/include/cantera/thermo/PDSS_IdealGas.h b/include/cantera/thermo/PDSS_IdealGas.h index efadbc45d..05be5147c 100644 --- a/include/cantera/thermo/PDSS_IdealGas.h +++ b/include/cantera/thermo/PDSS_IdealGas.h @@ -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 /*! diff --git a/include/cantera/thermo/PDSS_IonsFromNeutral.h b/include/cantera/thermo/PDSS_IonsFromNeutral.h index 123da1c8e..637a4960c 100644 --- a/include/cantera/thermo/PDSS_IonsFromNeutral.h +++ b/include/cantera/thermo/PDSS_IonsFromNeutral.h @@ -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 /*! diff --git a/include/cantera/thermo/PDSS_SSVol.h b/include/cantera/thermo/PDSS_SSVol.h index 83c60c159..ac32ab2fe 100644 --- a/include/cantera/thermo/PDSS_SSVol.h +++ b/include/cantera/thermo/PDSS_SSVol.h @@ -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); //@} diff --git a/src/thermo/PDSS_ConstVol.cpp b/src/thermo/PDSS_ConstVol.cpp index e574e603e..8489ed555 100644 --- a/src/thermo/PDSS_ConstVol.cpp +++ b/src/thermo/PDSS_ConstVol.cpp @@ -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); diff --git a/src/thermo/PDSS_IdealGas.cpp b/src/thermo/PDSS_IdealGas.cpp index 4b5e6c5fc..b7184417b 100644 --- a/src/thermo/PDSS_IdealGas.cpp +++ b/src/thermo/PDSS_IdealGas.cpp @@ -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); } diff --git a/src/thermo/PDSS_IonsFromNeutral.cpp b/src/thermo/PDSS_IonsFromNeutral.cpp index 9ca547a9b..9478794de 100644 --- a/src/thermo/PDSS_IonsFromNeutral.cpp +++ b/src/thermo/PDSS_IonsFromNeutral.cpp @@ -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); } diff --git a/src/thermo/PDSS_SSVol.cpp b/src/thermo/PDSS_SSVol.cpp index 19e4c5f3a..0900beaa5 100644 --- a/src/thermo/PDSS_SSVol.cpp +++ b/src/thermo/PDSS_SSVol.cpp @@ -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); diff --git a/src/zeroD/FlowReactor.cpp b/src/zeroD/FlowReactor.cpp index e36b79f6d..ddad8261f 100644 --- a/src/zeroD/FlowReactor.cpp +++ b/src/zeroD/FlowReactor.cpp @@ -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) { }