Static_cast to eliminate VC++ warnings.
This commit is contained in:
parent
840250ee65
commit
4b5fc228a2
2 changed files with 6 additions and 6 deletions
|
|
@ -8,7 +8,7 @@
|
|||
#include "MultiNewton.h"
|
||||
#include "OneDim.h"
|
||||
|
||||
#include "ctml.h"
|
||||
#include "../ctml.h"
|
||||
using namespace ctml;
|
||||
|
||||
namespace Cantera {
|
||||
|
|
@ -48,7 +48,7 @@ namespace Cantera {
|
|||
|
||||
// create a Newton iterator, and add each domain.
|
||||
m_newt = new MultiNewton(1);
|
||||
int nd = domains.size();
|
||||
int nd = static_cast<int>(domains.size());
|
||||
int i;
|
||||
for (i = 0; i < nd; i++) {
|
||||
addDomain(domains[i]);
|
||||
|
|
@ -73,7 +73,7 @@ namespace Cantera {
|
|||
|
||||
// if 'd' is not the first domain, link it to the last domain
|
||||
// added (the rightmost one)
|
||||
int n = m_dom.size();
|
||||
int n = static_cast<int>(m_dom.size());
|
||||
if (n > 0) m_dom.back()->append(d);
|
||||
|
||||
// every other domain is a connector
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@ namespace Cantera {
|
|||
|
||||
//done:
|
||||
//m_did_analysis = true;
|
||||
return m_loc.size();
|
||||
return static_cast<int>(m_loc.size());
|
||||
}
|
||||
|
||||
double Refiner::value(const double* x, int i, int j) {
|
||||
|
|
@ -202,7 +202,7 @@ namespace Cantera {
|
|||
}
|
||||
|
||||
void Refiner::show() {
|
||||
int nnew = m_loc.size();
|
||||
int nnew = static_cast<int>(m_loc.size());
|
||||
if (nnew > 0) {
|
||||
drawline();
|
||||
writelog(string("Refining grid in ") +
|
||||
|
|
@ -232,7 +232,7 @@ namespace Cantera {
|
|||
int Refiner::getNewGrid(int n, const doublereal* z,
|
||||
int nn, doublereal* zn) {
|
||||
int j;
|
||||
int nnew = m_loc.size();
|
||||
int nnew = static_cast<int>(m_loc.size());
|
||||
if (nnew + n > nn) {
|
||||
throw CanteraError("Refine::getNewGrid",
|
||||
"array size too small.");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue