Commit 4483158e authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Changed type of nvals to size_t.

parent e1b9ddb3
......@@ -66,7 +66,7 @@ public:
size_t nmiss;
double *data;
// pstream_t *pstreamptr_in;
/* unsigned long */ off_t nvals;
size_t nvals;
std::mutex m_mutex;
std::condition_variable tsDef, tsInq, vlistDef, isclosed;
......
......@@ -206,12 +206,12 @@ processNumsActive(void)
}
void
processAddNvals(off_t nvals)
processAddNvals(size_t nvals)
{
processSelf().nvals += nvals;
}
off_t
size_t
processInqNvals(int processID)
{
return Process.find(processID)->second.nvals;
......@@ -1268,7 +1268,7 @@ cdoFinish(void)
reset_text_color(stderr);
if (nvals > 0)
{
if (sizeof(int64_t) > sizeof(long))
if (sizeof(int64_t) > sizeof(size_t))
#if defined(_WIN32)
fprintf(stderr,
"Processed %I64d value%s from %d variable%s",
......@@ -1282,8 +1282,8 @@ cdoFinish(void)
ADD_PLURAL(nvars));
else
fprintf(stderr,
"Processed %ld value%s from %d variable%s",
(long) nvals,
"Processed %zu value%s from %d variable%s",
(size_t) nvals,
ADD_PLURAL(nvals),
nvars,
ADD_PLURAL(nvars));
......
......@@ -60,7 +60,7 @@ public:
double a_stime;
double cputime;
off_t nvals;
size_t nvals;
short nvars;
int ntimesteps;
short m_streamCnt;
......@@ -121,8 +121,8 @@ void processAccuTime(double utime, double stime);
void processDefCputime(int processID, double cputime);
double processInqCputime(int processID);
void processAddNvals(off_t nvals);
off_t processInqNvals(int processID);
void processAddNvals(size_t nvals);
size_t processInqNvals(int processID);
int processNums(void);
int processInqChildNum(void);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment