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

Took strcasecmp out of code, since it's not in VC++

Browse source
This commit is contained in:
Harry Moffat 2008-01-02 22:39:35 +00:00
parent 0a0dd2482e
commit e8343d8d9b
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Cantera/src/thermo/DebyeHuckel.cpp
View file

@ -25,7 +25,7 @@
#include "ThermoFactory.h"
#include "WaterProps.h"
#include "WaterPDSS.h"
#include <string.h>
#include <cstring>
using namespace std;
@ -1214,17 +1214,19 @@ namespace Cantera {
*/
static int interp_est(std::string estString) {
const char *cc = estString.c_str();
if (!strcasecmp(cc, "solvent")) {
string lc = lowercase(estString);
const char *ccl = lc.c_str();
if (!strcmp(ccl, "solvent")) {
return cEST_solvent;
} else if (!strcasecmp(cc, "chargedspecies")) {
} else if (!strcmp(ccl, "chargedspecies")) {
return cEST_chargedSpecies;
} else if (!strcasecmp(cc, "weakAcidAssociated")) {
} else if (!strcmp(ccl, "weakacidassociated")) {
return cEST_weakAcidAssociated;
} else if (!strcasecmp(cc, "strongAcidAssociated")) {
} else if (!strcmp(ccl, "strongacidassociated")) {
return cEST_strongAcidAssociated;
} else if (!strcasecmp(cc, "polarNeutral")) {
} else if (!strcmp(ccl, "polarneutral")) {
return cEST_polarNeutral;
} else if (!strcasecmp(cc, "nonpolarNeutral")) {
} else if (!strcmp(ccl, "nonpolarneutral")) {
return cEST_nonpolarNeutral;
}
int retn, rval;

16
Cantera/src/thermo/HMWSoln_input.cpp
View file

@ -20,7 +20,7 @@
#include "ThermoFactory.h"
#include "WaterProps.h"
#include "WaterPDSS.h"
#include <string.h>
#include <cstring>
using namespace std;
@ -35,17 +35,19 @@ namespace Cantera {
*/
int HMWSoln::interp_est(std::string estString) {
const char *cc = estString.c_str();
if (!strcasecmp(cc, "solvent")) {
string lcs = lowercase(estString);
const char *ccl = lcs.c_str();
if (!strcmp(ccl, "solvent")) {
return cEST_solvent;
} else if (!strcasecmp(cc, "chargedspecies")) {
} else if (!strcmp(ccl, "chargedspecies")) {
return cEST_chargedSpecies;
} else if (!strcasecmp(cc, "weakAcidAssociated")) {
} else if (!strcmp(ccl, "weakacidassociated")) {
return cEST_weakAcidAssociated;
} else if (!strcasecmp(cc, "strongAcidAssociated")) {
} else if (!strcmp(ccl, "strongacidassociated")) {
return cEST_strongAcidAssociated;
} else if (!strcasecmp(cc, "polarNeutral")) {
} else if (!strcmp(ccl, "polarneutral")) {
return cEST_polarNeutral;
} else if (!strcasecmp(cc, "nonpolarNeutral")) {
} else if (!strcmp(ccl, "nonpolarneutral")) {
return cEST_nonpolarNeutral;
}
int retn, rval;