From b0cf0db1d35ecb854b3d2a1727671b2307c77109 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Mon, 12 Jul 2004 14:57:53 +0000 Subject: [PATCH] Static casts to eliminates warnings from msvc --- Cantera/clib/src/Storage.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Cantera/clib/src/Storage.cpp b/Cantera/clib/src/Storage.cpp index 93b2fed9e..c933ef2b7 100755 --- a/Cantera/clib/src/Storage.cpp +++ b/Cantera/clib/src/Storage.cpp @@ -28,19 +28,21 @@ int Storage::addThermo(thermo_t* th) { if (th->index() >= 0) return th->index(); __thtable.push_back(th); - int n = __thtable.size() - 1; + int n = static_cast(__thtable.size()) - 1; th->setIndex(n); __thmap[th->id()] = n; return n; } -int Storage::nThermo() { return __thtable.size(); } +int Storage::nThermo() { + return static_cast(__thtable.size()); +} int Storage::addKinetics(Kinetics* kin) { if (kin->index() >= 0) return kin->index(); __ktable.push_back(kin); - int n = __ktable.size() - 1; + int n = static_cast(__ktable.size()) - 1; kin->setIndex(n); return n; } @@ -49,7 +51,7 @@ int Storage::addTransport(Transport* tr) { if (tr->index() >= 0) return tr->index(); __trtable.push_back(tr); - int n = __trtable.size() - 1; + int n = static_cast(__trtable.size()) - 1; tr->setIndex(n); return n; } @@ -69,21 +71,21 @@ int Storage::addTransport(Transport* tr) { int Storage::clear() { int i, n; - n = __thtable.size(); + n = static_cast(__thtable.size()); for (i = 1; i < n; i++) { if (__thtable[i] != __thtable[0]) { delete __thtable[i]; __thtable[i] = __thtable[0]; } } - n = __ktable.size(); + n = static_cast(__ktable.size()); for (i = 1; i < n; i++) { if (__ktable[i] != __ktable[0]) { delete __ktable[i]; __ktable[i] = __ktable[0]; } } - n = __trtable.size(); + n = static_cast(__trtable.size()); for (i = 1; i < n; i++) { if (__trtable[i] != __trtable[0]) { delete __trtable[i];