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

Clean up function prototypes to avoid 'a is hidden by b' warnings

Browse source 
where the subclass prototype had an int and the super had a size_t
for a virtual function of the same name.
This commit is contained in:
Victor Brunini 2012-11-14 00:04:05 +00:00
parent 28171eeece
commit 7d8a61baf1
14 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -763,7 +763,7 @@ public:
#ifdef H298MODIFY_CAPABILITY
virtual void modifyOneHf298SS(const int k, const doublereal Hf298New) {
virtual void modifyOneHf298SS(const size_t &k, const doublereal Hf298New) {
m_spthermo->modifyOneHf298(k, Hf298New);
m_tlast += 0.0001234;
}

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

@ -768,7 +768,7 @@ public:
* @param k Species k
* @param Hf298New Specify the new value of the Heat of Formation at 298K and 1 bar
*/
virtual void modifyOneHf298SS(const int k, const doublereal Hf298New) {
virtual void modifyOneHf298SS(const size_t &k, const doublereal Hf298New) {
m_spthermo->modifyOneHf298(k, Hf298New);
m_tlast += 0.0001234;
}

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

@ -421,7 +421,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);
//! Initialize or Reinitialize all shallow pointers in the object
/*!

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

@ -482,7 +482,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/SingleSpeciesTP.h
View file

@ -402,7 +402,7 @@ public:
* @param k Species k
* @param Hf298New Specify the new value of the Heat of Formation at 298K and 1 bar
*/
virtual void modifyOneHf298SS(const int k, const doublereal Hf298New) {
virtual void modifyOneHf298SS(const size_t &k, const doublereal Hf298New) {
m_spthermo->modifyOneHf298(k, Hf298New);
m_tlast += 0.0001234;
}

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

@ -328,7 +328,7 @@ public:
#ifdef H298MODIFY_CAPABILITY
virtual void modifyOneHf298SS(const int k, const doublereal Hf298New) {
virtual void modifyOneHf298SS(const size_t &k, const doublereal Hf298New) {
m_spthermo->modifyOneHf298(k, Hf298New);
m_tlast += 0.0001234;
}

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

@ -536,7 +536,7 @@ public:
* @param k Species k
* @param Hf298New Specify the new value of the Heat of Formation at 298K and 1 bar
*/
virtual void modifyOneHf298SS(const int k, const doublereal Hf298New) {
virtual void modifyOneHf298SS(const size_t &k, const doublereal Hf298New) {
m_spthermo->modifyOneHf298(k, Hf298New);
m_tlast += 0.0001234;
}

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

@ -204,7 +204,7 @@ public:
* @param k Species k
* @param Hf298New Specify the new value of the Heat of Formation at 298K and 1 bar
*/
virtual void modifyOneHf298SS(const int k, const doublereal Hf298New) {
virtual void modifyOneHf298SS(const size_t &k, const doublereal Hf298New) {
m_spthermo->modifyOneHf298(k, Hf298New);
}

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

@ -426,7 +426,7 @@ public:
* @param Hf298New Specify the new value of the Heat of Formation at 298K and 1 bar.
* units = J/kmol.
*/
void modifyOneHf298SS(const int k, const doublereal Hf298New);
void modifyOneHf298SS(const size_t &k, const doublereal Hf298New);
#endif
//! Returns the vector of nondimensional

8
include/cantera/transport/PecosTransport.h
View file

@ -87,7 +87,7 @@ public:
*/
virtual doublereal thermalConductivity();
virtual void getBinaryDiffCoeffs(const int ld, doublereal* const d);
virtual void getBinaryDiffCoeffs(const size_t ld, doublereal* const d);
//! Mixture-averaged diffusion coefficients [m^2/s].
@ -146,11 +146,11 @@ public:
* Flat vector with the m_nsp in the inner loop.
* length = ldx * ndim
*/
virtual void getSpeciesFluxes(int ndim,
virtual void getSpeciesFluxes(size_t ndim,
const doublereal* grad_T,
int ldx,
size_t ldx,
const doublereal* grad_X,
int ldf, doublereal* fluxes);
size_t ldf, doublereal* fluxes);
//! Initialize the transport object
/*!

2
src/thermo/PDSS_HKFT.cpp
View file

@ -631,7 +631,7 @@ void PDSS_HKFT::initThermo()
}
void PDSS_HKFT::initThermoXML(const XML_Node& phaseNode, std::string& id)
void PDSS_HKFT::initThermoXML(const XML_Node& phaseNode, const std::string& id)
{
PDSS::initThermoXML(phaseNode, id);
}

2
src/thermo/PDSS_Water.cpp
View file

@ -308,7 +308,7 @@ void PDSS_Water::initThermo()
PDSS::initThermo();
}
void PDSS_Water::initThermoXML(const XML_Node& phaseNode, std::string& id)
void PDSS_Water::initThermoXML(const XML_Node& phaseNode, const std::string& id)
{
PDSS::initThermoXML(phaseNode, id);
}

2
src/thermo/VPStandardStateTP.cpp
View file

@ -228,7 +228,7 @@ void VPStandardStateTP::getEnthalpy_RT(doublereal* hrt) const
* @param k Species k
* @param Hf298New Specify the new value of the Heat of Formation at 298K and 1 bar
*/
void VPStandardStateTP::modifyOneHf298SS(const int k, const doublereal Hf298New)
void VPStandardStateTP::modifyOneHf298SS(const size_t &k, const doublereal Hf298New)
{
m_spthermo->modifyOneHf298(k, Hf298New);
m_Tlast_ss += 0.0001234;

8
src/transport/PecosTransport.cpp
View file

@ -171,7 +171,7 @@ doublereal PecosTransport::viscosity()
* Adding more doxygen would be good here
*/
void PecosTransport::getBinaryDiffCoeffs(const int ld, doublereal* const d)
void PecosTransport::getBinaryDiffCoeffs(const size_t ld, doublereal* const d)
{
int i,j;
@ -272,9 +272,9 @@ void PecosTransport::getThermalDiffCoeffs(doublereal* const dt)
* This is neglective pressure, forced and thermal diffusion.
*
*/
void PecosTransport::getSpeciesFluxes(int ndim,
const doublereal* grad_T, int ldx, const doublereal* grad_X,
int ldf, doublereal* fluxes)
void PecosTransport::getSpeciesFluxes(size_t ndim,
const doublereal* grad_T, size_t ldx, const doublereal* grad_X,
size_t ldf, doublereal* fluxes)
{
int n=0, k;