summaryrefslogtreecommitdiffstats
path: root/test/tmisc.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-03-09 11:27:46 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-03-09 11:27:46 (GMT)
commitab19d0636a2d490c34a3b40a39f14286b9557127 (patch)
treedcc2f31ca029891e9c808e628ffab1dd66a55764 /test/tmisc.c
parent85beb272c5038ffa2e2dfe95f60474e8ca616720 (diff)
downloadhdf5-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/tmisc.c')
-rw-r--r--test/tmisc.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/test/tmisc.c b/test/tmisc.c
index fcb5eac..e4322a2 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -2447,17 +2447,17 @@ test_misc13(void)
static void
test_misc14(void)
{
- hid_t file_id; /* File ID */
- hid_t fapl; /* File access property list ID */
- hid_t DataSpace; /* Dataspace ID */
- hid_t Dataset1; /* Dataset ID #1 */
- hid_t Dataset2; /* Dataset ID #2 */
- hid_t Dataset3; /* Dataset ID #3 */
- double data1 = 5.0; /* Data to write for dataset #1 */
- double data2 = 10.0; /* Data to write for dataset #2 */
- double data3 = 15.0; /* Data to write for dataset #3 */
- double rdata; /* Data read in */
- herr_t ret; /* Generic return value */
+ hid_t file_id; /* File ID */
+ hid_t fapl; /* File access property list ID */
+ hid_t DataSpace; /* Dataspace ID */
+ hid_t Dataset1; /* Dataset ID #1 */
+ hid_t Dataset2; /* Dataset ID #2 */
+ hid_t Dataset3; /* Dataset ID #3 */
+ double data1 = 5.0F; /* Data to write for dataset #1 */
+ double data2 = 10.0F; /* Data to write for dataset #2 */
+ double data3 = 15.0F; /* Data to write for dataset #3 */
+ double rdata; /* Data read in */
+ herr_t ret; /* Generic return value */
/* Test creating two datasets and deleting the second */
@@ -4993,7 +4993,7 @@ test_misc28(void)
* bytes). */
fapl = H5Pcreate(H5P_FILE_ACCESS);
CHECK(fapl, FAIL, "H5Pcreate");
- ret = H5Pset_cache(fapl, MISC28_NSLOTS, MISC28_NSLOTS, MISC28_SIZE, 0.75);
+ ret = H5Pset_cache(fapl, MISC28_NSLOTS, MISC28_NSLOTS, MISC28_SIZE, 0.75F);
CHECK(ret, FAIL, "H5Pset_cache");
/* Create the dcpl and set the chunk size */