diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-03-01 18:48:54 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-03-01 18:48:54 (GMT) |
commit | d8e3d8e9082f0926e80e7e7010c00bda05a215b3 (patch) | |
tree | bf7717a29d0938ab15e6f54ef981e5abfcf467a5 /tools/perform/zip_perf.c | |
parent | ac290b5e45412a0a93fde620490d703c773d27d4 (diff) | |
download | hdf5-d8e3d8e9082f0926e80e7e7010c00bda05a215b3.zip hdf5-d8e3d8e9082f0926e80e7e7010c00bda05a215b3.tar.gz hdf5-d8e3d8e9082f0926e80e7e7010c00bda05a215b3.tar.bz2 |
[svn-r26333] Eliminates gcc warnings due to -Wunsuffixed-float-constants.
- Adds 'F' suffixes for most float constants.
- A few constants MUST be of type double. These now receive the long
double L suffix and are then cast to double. I do this via a new
H5_DOUBLE() macro which was added to H5private.h.
Fixes: HDFFV-9148
Tested on: h5committest
Diffstat (limited to 'tools/perform/zip_perf.c')
-rw-r--r-- | tools/perform/zip_perf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perform/zip_perf.c b/tools/perform/zip_perf.c index edd5b0f..f73ba40 100644 --- a/tools/perform/zip_perf.c +++ b/tools/perform/zip_perf.c @@ -43,10 +43,10 @@ #define ONE_MB (ONE_KB * ONE_KB) #define ONE_GB (ONE_MB * ONE_KB) -#define MICROSECOND 1000000.0 +#define MICROSECOND 1000000.0F /* report 0.0 in case t is zero too */ -#define MB_PER_SEC(bytes,t) ((fabs(t)<0.0000000001) ? 0.0 : ((((double)bytes) / ONE_MB) / (t))) +#define MB_PER_SEC(bytes,t) ((fabs(t)<0.0000000001F) ? 0.0F : ((((double)bytes) / ONE_MB) / (t))) #ifndef TRUE #define TRUE 1 @@ -182,7 +182,7 @@ write_file(Bytef *source, uLongf sourceLen) /* destination buffer needs to be at least 0.1% larger than sourceLen * plus 12 bytes */ - destLen = (uLongf)((double)sourceLen + ((double)sourceLen * 0.1)) + 12; + destLen = (uLongf)((double)sourceLen + ((double)sourceLen * 0.1F)) + 12; dest = (Bytef *)HDmalloc(destLen); if (!dest) @@ -464,7 +464,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size, error("out of memory"); } - compression_time = 0.0; + compression_time = 0.0F; if (random_test) fill_with_random_data(src, src_len); |