Skip to content

Commit 603ced3

Browse files
committed
eliminate some MSVC warnings
Signed-off-by: Steven Noonan <steven@uplinklabs.net>
1 parent bb8fbcf commit 603ced3

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

clock.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,15 +409,15 @@ void cpu_clock_calibrate(void)
409409
minc = ~0ULL;
410410
maxc = samples = avg = 0;
411411
for (i = 0; i < NR_TIME_ITERS; i++) {
412-
double this = cycles[i];
412+
double this = (double)(cycles[i]);
413413

414414
minc = min(cycles[i], minc);
415415
maxc = max(cycles[i], maxc);
416416

417417
if ((fmax(this, mean) - fmin(this, mean)) > S)
418418
continue;
419419
samples++;
420-
avg += this;
420+
avg += cycles[i];
421421
}
422422

423423
S /= (double) NR_TIME_ITERS;

main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static void clock_compare(const struct clockspec self, const struct clockspec ot
320320
/*
321321
* Clamp to either 30 or 200.
322322
*/
323-
samples = fmax(30.0, 1e6 / observed_res);
323+
samples = (uint32_t)fmax(30.0, 1e6 / observed_res);
324324
if (samples > 200)
325325
samples = 200;
326326
else if (samples > 30)
@@ -685,7 +685,7 @@ int main(int argc, char **argv)
685685

686686
printf("%-22s %s\n",
687687
clock_name(*p),
688-
pretty_print(buf, sizeof(buf), res, rate_suffixes, 10));
688+
pretty_print(buf, sizeof(buf), (double)res, rate_suffixes, 10));
689689
}
690690
printf("\n\n");
691691

0 commit comments

Comments
 (0)