From 9927784db39bcc35fac6b332eb4af2e42c3455f5 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Fri, 2 Jul 2004 16:05:33 +0000 Subject: [PATCH] Corrected file locations of include files. static_cast to eliminate VC++ warnings. --- Cantera/src/transport/TransportFactory.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cantera/src/transport/TransportFactory.cpp b/Cantera/src/transport/TransportFactory.cpp index 94ae9d300..305979217 100755 --- a/Cantera/src/transport/TransportFactory.cpp +++ b/Cantera/src/transport/TransportFactory.cpp @@ -24,14 +24,14 @@ #include "TransportFactory.h" -#include "polyfit.h" +#include "../polyfit.h" #include "MMCollisionInt.h" #include -#include "xml.h" +#include "../xml.h" #include "TransportParams.h" -#include "global.h" -#include "IdealGasPhase.h" -#include "ctml.h" +#include "../global.h" +#include "../IdealGasPhase.h" +#include "../ctml.h" /** @@ -516,14 +516,14 @@ namespace Cantera { tr.astar_poly.push_back(ca); tr.bstar_poly.push_back(cb); tr.cstar_poly.push_back(cc); - tr.poly[i][j] = tr.astar_poly.size() - 1; + tr.poly[i][j] = static_cast(tr.astar_poly.size()) - 1; tr.fitlist.push_back(dstar); } // delta* found in fitlist, so just point to this // polynomial else { - tr.poly[i][j] = (dptr - tr.fitlist.begin()); + tr.poly[i][j] = static_cast((dptr - tr.fitlist.begin())); } tr.poly[j][i] = tr.poly[i][j]; } @@ -558,7 +558,7 @@ namespace Cantera { //XML_Node* sparray = find_XML("", &root, "", "", "speciesData"); vector xspecies; transport_database->getChildren("species",xspecies); - int nsp = xspecies.size(); + int nsp = static_cast(xspecies.size()); // read all entries in database into 'datatable' and check for // errors. Note that this procedure validates all entries, not