Changed the name of some arguments that conflicted with names of member

data. This created a warning message on Solaris.
This commit is contained in:
Harry Moffat 2006-03-07 20:59:53 +00:00
parent 4015fd7cf1
commit 38db8309fe
3 changed files with 9 additions and 5 deletions

View file

@ -1,2 +1,3 @@
Makefile
.depends
SunWS_cache

View file

@ -60,16 +60,16 @@ namespace Cantera {
doublereal tsmax, int loglevel = 0);
doublereal omega22(double ts, double deltastar);
doublereal astar(double tstar, double deltastar);
doublereal bstar(double tstar, double deltastar);
doublereal cstar(double tstar, double deltastar);
doublereal astar(double ts, double deltastar);
doublereal bstar(double ts, double deltastar);
doublereal cstar(double ts, double deltastar);
void fit(ostream& logfile, int degree, doublereal deltastar,
doublereal* astar, doublereal* bstar, doublereal* cstar);
void fit_omega22(ostream& logfile, int degree, doublereal deltastar, doublereal* om22);
doublereal omega11(double tstar, double deltastar) {
return omega22(tstar, deltastar)/astar(tstar, deltastar);
doublereal omega11(double ts, double deltastar) {
return omega22(ts, deltastar)/astar(ts, deltastar);
}
private:

View file

@ -60,6 +60,9 @@ clean:
echo "$(RM) $(LIB)" ; \
fi)
$(RM) *.o *~ .depends
(if test -d SunWS_cache ; then \
$(RM) -rf SunWS_cache ; \
fi )
depends: $(DEPENDS)
cat *.d > .depends