From c2372197dee0236d2850418dae8ddac8d7098537 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 17 Jan 2012 04:12:58 +0000 Subject: [PATCH] Fixing signed/unsigned comparison warnings in clib --- Cantera/clib/src/ct.cpp | 12 ++++++------ Cantera/clib/src/ct.h | 4 ++-- Cantera/clib/src/ctfunc.cpp | 2 +- Cantera/clib/src/ctfunc.h | 2 +- Cantera/clib/src/ctmultiphase.cpp | 14 +++++++------- Cantera/clib/src/ctmultiphase.h | 2 +- Cantera/clib/src/ctonedim.cpp | 5 ++--- Cantera/clib/src/ctxml.cpp | 4 ++-- Cantera/clib/src/ctxml.h | 2 +- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Cantera/clib/src/ct.cpp b/Cantera/clib/src/ct.cpp index ae97174dc..4575f3553 100755 --- a/Cantera/clib/src/ct.cpp +++ b/Cantera/clib/src/ct.cpp @@ -230,7 +230,7 @@ extern "C" { ThermoPhase* p = ph(n); compositionMap xx; size_t nsp = p->nSpecies(); - for (int n = 0; n < nsp; n++) { + for (size_t n = 0; n < nsp; n++) { xx[p->speciesName(n)] = -1; } parseCompString(string(x), xx); @@ -258,7 +258,7 @@ extern "C" { ThermoPhase* p = ph(n); compositionMap yy; size_t nsp = p->nSpecies(); - for (int n = 0; n < nsp; n++) { + for (size_t n = 0; n < nsp; n++) { yy[p->speciesName(n)] = -1; } parseCompString(string(y), yy); @@ -306,7 +306,7 @@ extern "C" { return 0; } - int DLL_EXPORT phase_getSpeciesName(int n, size_t k, int lennm, char* nm) { + int DLL_EXPORT phase_getSpeciesName(int n, size_t k, size_t lennm, char* nm) { try { string spnm = ph(n)->speciesName(k); size_t lout = min(lennm, spnm.size()); @@ -318,7 +318,7 @@ extern "C" { //catch (...) {return ERR;} } - int DLL_EXPORT phase_getElementName(int n, size_t m, int lennm, char* nm) { + int DLL_EXPORT phase_getElementName(int n, size_t m, size_t lennm, char* nm) { try { string elnm = ph(n)->elementName(m); size_t lout = min(lennm, elnm.size()); @@ -909,7 +909,7 @@ extern "C" { } - int DLL_EXPORT kin_getDeltaEntropy(int n, int len, double* deltaS) { + int DLL_EXPORT kin_getDeltaEntropy(int n, size_t len, double* deltaS) { try { Kinetics* k = kin(n); if (len >= k->nReactions()) { @@ -968,7 +968,7 @@ extern "C" { Kinetics* k = kin(n); ThermoPhase* p = &k->thermo(); const vector_fp& mw = p->molecularWeights(); - int nsp = static_cast(mw.size()); + size_t nsp = mw.size(); double rrho = 1.0/p->density(); if (len >= nsp) { k->getNetProductionRates(ydot); diff --git a/Cantera/clib/src/ct.h b/Cantera/clib/src/ct.h index c591a8fd9..91d123c3c 100755 --- a/Cantera/clib/src/ct.h +++ b/Cantera/clib/src/ct.h @@ -37,8 +37,8 @@ extern "C" { EEXXTT int DLL_CPREFIX phase_setMassFractionsByName(int n, char* y); EEXXTT int DLL_CPREFIX phase_getAtomicWeights(int n, size_t lenm, double* atw); EEXXTT int DLL_CPREFIX phase_getMolecularWeights(int n, size_t lenm, double* mw); - EEXXTT int DLL_CPREFIX phase_getElementName(int n, size_t k, int lennm, char* nm); - EEXXTT int DLL_CPREFIX phase_getSpeciesName(int n, size_t m, int lennm, char* nm); + EEXXTT int DLL_CPREFIX phase_getElementName(int n, size_t k, size_t lennm, char* nm); + EEXXTT int DLL_CPREFIX phase_getSpeciesName(int n, size_t m, size_t lennm, char* nm); EEXXTT int DLL_CPREFIX phase_getName(int n, size_t lennm, char* nm); EEXXTT int DLL_CPREFIX phase_setName(int n, const char* nm); EEXXTT size_t DLL_CPREFIX phase_elementIndex(int n, char* nm); diff --git a/Cantera/clib/src/ctfunc.cpp b/Cantera/clib/src/ctfunc.cpp index d0e731028..a1144556e 100755 --- a/Cantera/clib/src/ctfunc.cpp +++ b/Cantera/clib/src/ctfunc.cpp @@ -25,7 +25,7 @@ extern "C" { // functions - int DLL_EXPORT func_new(int type, int n, size_t lenp, double* params) { + int DLL_EXPORT func_new(int type, size_t n, size_t lenp, double* params) { func_t* r=0; size_t m = lenp; try { diff --git a/Cantera/clib/src/ctfunc.h b/Cantera/clib/src/ctfunc.h index cc4935f27..a27bf7e4e 100755 --- a/Cantera/clib/src/ctfunc.h +++ b/Cantera/clib/src/ctfunc.h @@ -7,7 +7,7 @@ #include "clib_defs.h" extern "C" { - EEXXTT int DLL_CPREFIX func_new(int type, int n, size_t lenp, double* p); + EEXXTT int DLL_CPREFIX func_new(int type, size_t n, size_t lenp, double* p); EEXXTT int DLL_CPREFIX func_del(int i); EEXXTT int DLL_CPREFIX func_copy(int i); EEXXTT int DLL_CPREFIX func_assign(int i, int j); diff --git a/Cantera/clib/src/ctmultiphase.cpp b/Cantera/clib/src/ctmultiphase.cpp index d06313261..dc801c1b0 100644 --- a/Cantera/clib/src/ctmultiphase.cpp +++ b/Cantera/clib/src/ctmultiphase.cpp @@ -28,11 +28,11 @@ inline ThermoPhase* _th(int n) { return Storage::__storage->__thtable[n]; } -static bool checkSpecies(int i, int k) { +static bool checkSpecies(int i, size_t k) { try { - if (k < 0 || k >= _mix(i)->nSpecies()) + if (k >= _mix(i)->nSpecies()) throw CanteraError("checkSpecies", - "illegal species index ("+int2str(k)+") "); + "illegal species index ("+int2str(int(k))+") "); return true; } catch (CanteraError) { @@ -40,11 +40,11 @@ static bool checkSpecies(int i, int k) { } } -static bool checkElement(int i, int m) { +static bool checkElement(int i, size_t m) { try { - if (m < 0 || m >= _mix(i)->nElements()) + if (m >= _mix(i)->nElements()) throw CanteraError("checkElement", - "illegal element index ("+int2str(m)+") "); + "illegal element index ("+int2str(int(m))+") "); return true; } catch (CanteraError) { @@ -254,7 +254,7 @@ extern "C" { } int DLL_EXPORT mix_getValidChemPotentials(int i, double bad_mu, - int standard, int lenmu, double* mu) { + int standard, size_t lenmu, double* mu) { bool st = (standard == 1); try { if (lenmu < _mix(i)->nSpecies()) diff --git a/Cantera/clib/src/ctmultiphase.h b/Cantera/clib/src/ctmultiphase.h index f8bda233d..5ae143ee9 100644 --- a/Cantera/clib/src/ctmultiphase.h +++ b/Cantera/clib/src/ctmultiphase.h @@ -42,7 +42,7 @@ extern "C" { int maxiter, int loglevel); EEXXTT int DLL_CPREFIX mix_getChemPotentials(int i, size_t lenmu, double* mu); EEXXTT int DLL_CPREFIX mix_getValidChemPotentials(int i, double bad_mu, - int standard, int lenmu, double* mu); + int standard, size_t lenmu, double* mu); EEXXTT double DLL_CPREFIX mix_enthalpy(int i); EEXXTT double DLL_CPREFIX mix_entropy(int i); diff --git a/Cantera/clib/src/ctonedim.cpp b/Cantera/clib/src/ctonedim.cpp index c824bf163..3104f8138 100644 --- a/Cantera/clib/src/ctonedim.cpp +++ b/Cantera/clib/src/ctonedim.cpp @@ -375,9 +375,8 @@ extern "C" { int DLL_EXPORT stflow_setFixedTempProfile(int i, size_t n, double* pos, size_t m, double* temp) { try { - int j; vector_fp vpos(n), vtemp(n); - for (j = 0; j < n; j++) { + for (size_t j = 0; j < n; j++) { vpos[j] = pos[j]; vtemp[j] = temp[j]; } @@ -457,7 +456,7 @@ extern "C" { size_t np, double* pos, size_t nv, double* v) { try { vector_fp vv, pv; - for (int n = 0; n < np; n++) { + for (size_t n = 0; n < np; n++) { vv.push_back(v[n]); pv.push_back(pos[n]); } diff --git a/Cantera/clib/src/ctxml.cpp b/Cantera/clib/src/ctxml.cpp index c06dda73f..89166bd83 100644 --- a/Cantera/clib/src/ctxml.cpp +++ b/Cantera/clib/src/ctxml.cpp @@ -247,7 +247,7 @@ extern "C" { return 0; } - int DLL_EXPORT ctml_getFloatArray(int i, int n, doublereal* data, int iconvert) { + int DLL_EXPORT ctml_getFloatArray(int i, size_t n, doublereal* data, int iconvert) { try { XML_Node& node = *_xml(i); vector_fp v; @@ -262,7 +262,7 @@ extern "C" { "array must be dimensioned at least "+int2str(int(nv))); } - for (int i = 0; i < nv; i++) { + for (size_t i = 0; i < nv; i++) { data[i] = v[i]; } } diff --git a/Cantera/clib/src/ctxml.h b/Cantera/clib/src/ctxml.h index d384853cb..882eceadd 100644 --- a/Cantera/clib/src/ctxml.h +++ b/Cantera/clib/src/ctxml.h @@ -36,7 +36,7 @@ extern "C" { EEXXTT int DLL_CPREFIX xml_addChildNode(int i, int j); EEXXTT int DLL_CPREFIX xml_write(int i, const char* file); EEXXTT int DLL_CPREFIX xml_removeChild(int i, int j); - EEXXTT int DLL_CPREFIX ctml_getFloatArray(int i, int n, double* data, int iconvert=0); + EEXXTT int DLL_CPREFIX ctml_getFloatArray(int i, size_t n, double* data, int iconvert=0); } #endif