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

Changes to support MSVC

Browse source
This commit is contained in:
Harry Moffat 2004-08-27 20:08:10 +00:00
parent 686e4ca59f
commit 6b052f4d2e
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tools/testtools/csvdiff.cpp
View file

@ -258,7 +258,7 @@ static void get_sizes(FILE *fp, int &nTitleLines, int &nColTitleLines,
* Strip a trailing comma from the scanline -
* -> These are not significant
*/
int ccount = strlen(scanLine);
int ccount = static_cast<int>(strlen(scanLine));
if (ccount > 0) {
if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
}
@ -293,7 +293,7 @@ static void get_sizes(FILE *fp, int &nTitleLines, int &nColTitleLines,
* Strip a trailing comma from the scanline -
* -> These are not significant
*/
int ccount = strlen(scanLine);
int ccount = static_cast<int>(strlen(scanLine));
if (ccount > 0) {
if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
}
@ -347,7 +347,7 @@ static void get_sizes(FILE *fp, int &nTitleLines, int &nColTitleLines,
* Strip a trailing comma from the scanline -
* -> These are not significant
*/
int ccount = strlen(scanLine);
int ccount = static_cast<int>(strlen(scanLine));
if (ccount > 0) {
if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
}
@ -398,7 +398,7 @@ read_title(FILE *fp, char ***title, int nTitleLines)
* Strip a trailing comma from the scanline -
* -> These are not significant
*/
int ccount = strlen(scanLine);
int ccount = static_cast<int>(strlen(scanLine));
if (ccount > 0) {
if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
}
@ -427,7 +427,7 @@ read_colTitle(FILE *fp, char ****ColMLNames_ptr, int nColTitleLines, int nCol)
* Strip a trailing comma from the scanline -
* -> These are not significant
*/
int ccount = strlen(scanLine);
int ccount = static_cast<int>(strlen(scanLine));
if (ccount > 0) {
if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
}
@ -483,7 +483,7 @@ read_values(FILE *fp, double **NVValues, int nCol, int nDataRows)
* Strip a trailing comma from the scanline -
* -> These are not significant
*/
int ccount = strlen(scanLine);
int ccount = static_cast<int>(strlen(scanLine));
if (ccount > 0) {
if (scanLine[ccount-1] == ',') scanLine[ccount-1] = '\0';
}

11
tools/testtools/mdp_allo.cpp
View file

@ -220,16 +220,7 @@ static double *smalloc(size_t n);
/****************************************************************************/
/****************************************************************************/
#ifdef __STDC__
double *mdp_array_alloc(int numdim, ...)
#else
double *mdp_array_alloc(va_alist)
va_dcl
#endif
/****************************************************************************/
/****************************************************************************/
/****************************************************************************/
double *mdp_array_alloc(int numdim, ...)
{
int i, j;
struct dim {

1
tools/testtools/mdp_allo.h
View file

@ -16,6 +16,7 @@
#ifndef MDP_ALLO_H
#define MDP_ALLO_H
#include <string.h>
/*****************************************************************************/
/*
* If we have array_alloc() from another Sandia program, we will not use