diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-03-09 11:27:46 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-03-09 11:27:46 (GMT) |
commit | ab19d0636a2d490c34a3b40a39f14286b9557127 (patch) | |
tree | dcc2f31ca029891e9c808e628ffab1dd66a55764 /test/fillval.c | |
parent | 85beb272c5038ffa2e2dfe95f60474e8ca616720 (diff) | |
download | hdf5-ab19d0636a2d490c34a3b40a39f14286b9557127.zip hdf5-ab19d0636a2d490c34a3b40a39f14286b9557127.tar.gz hdf5-ab19d0636a2d490c34a3b40a39f14286b9557127.tar.bz2 |
[svn-r26398] Merges r26333 from trunk
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.
- Additionally, some 1.8-specific float suffixes were added.
Fixes: HDFFV-9148
Tested on: h5committest
Diffstat (limited to 'test/fillval.c')
-rw-r--r-- | test/fillval.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/fillval.c b/test/fillval.c index b73ed17..aa8831e 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -909,9 +909,9 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, else if(datatype == H5T_COMPOUND) { HDmemset(buf_c, 0, ((size_t)nelmts * sizeof(comp_datatype))); for(u = 0; u < nelmts; u++) { - buf_c[u].a = (float)1111.11; + buf_c[u].a = 1111.11F; buf_c[u].x = 2222; - buf_c[u].y = 3333.3333; + buf_c[u].y = 3333.3333F; buf_c[u].z = 'd'; } if(H5Dwrite(dset2, ctype_id, mspace, fspace, H5P_DEFAULT, buf_c) < 0) @@ -1144,7 +1144,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout) * as compound type */ if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; HDmemset(&fill_ctype, 0, sizeof(fill_ctype)); - fill_ctype.y = 4444.4444; + fill_ctype.y = 4444.4444F; if(H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0) goto error; nerrors += test_rdwr_cases(file, dcpl, "dset11", &fill_ctype, H5D_FILL_TIME_ALLOC, layout, H5T_COMPOUND, ctype_id); @@ -1197,7 +1197,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout) * as compound type */ if(H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; HDmemset(&fill_ctype, 0, sizeof(fill_ctype)); - fill_ctype.y = 4444.4444; + fill_ctype.y = 4444.4444F; if(H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0) goto error; nerrors += test_rdwr_cases(file, dcpl, "dset12", &fill_ctype, H5D_FILL_TIME_ALLOC, layout, H5T_COMPOUND, ctype_id); |