summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-01-23 22:35:16 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-05-20 14:31:52 (GMT)
commit36647e79b95b03f1e2096b86e5d7d51854312eab (patch)
tree148486c89ab71820cd17e02f0138ba3e4bdaf665 /test
parent40c5e67e418e01de3edd046e61481aeae4d18ad2 (diff)
downloadhdf5-36647e79b95b03f1e2096b86e5d7d51854312eab.zip
hdf5-36647e79b95b03f1e2096b86e5d7d51854312eab.tar.gz
hdf5-36647e79b95b03f1e2096b86e5d7d51854312eab.tar.bz2
Revert "Moved -Wunsuffixed-float-constants to the developer warnings."
This reverts commit 12bc75c6172ca7b64c33b17cf538a7629500cf2f.
Diffstat (limited to 'test')
-rw-r--r--test/cache.c2
-rw-r--r--test/cache_api.c8
-rw-r--r--test/direct_chunk.c2
-rw-r--r--test/dsets.c20
-rw-r--r--test/tattr.c4
5 files changed, 18 insertions, 18 deletions
diff --git a/test/cache.c b/test/cache.c
index 6240149..4da11ad 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -19917,7 +19917,7 @@ check_auto_cache_resize(hbool_t cork_ageout, unsigned paged)
/* NOTE: upper_hr_threshold MUST be type double (not float)
* or the cache test will fail on 64-bit systems.
*/
- auto_size_ctl.upper_hr_threshold = 0.999; /* for ease of testing */
+ auto_size_ctl.upper_hr_threshold = H5_DOUBLE(0.999); /* for ease of testing */
auto_size_ctl.decrement = 0.5f;
diff --git a/test/cache_api.c b/test/cache_api.c
index ca2e0ca..87d0025 100644
--- a/test/cache_api.c
+++ b/test/cache_api.c
@@ -1664,7 +1664,7 @@ init_invalid_configs(void) {
configs[13].lower_hr_threshold = 1.00000001f;
/* 14 -- increment too small */
- configs[14].increment = 0.999999999999;
+ configs[14].increment = H5_DOUBLE(0.999999999999);
/* 15 -- invalid flash_incr_mode */
configs[15].flash_incr_mode = (enum H5C_cache_flash_incr_mode)-1;
@@ -1697,7 +1697,7 @@ init_invalid_configs(void) {
/* 23 -- decrement too big */
configs[23].decr_mode = H5C_decr__threshold;
- configs[23].decrement = 1.0000000001;
+ configs[23].decrement = H5_DOUBLE(1.0000000001);
/* 24 -- epochs_before_eviction too small */
configs[24].epochs_before_eviction = 0;
@@ -1709,13 +1709,13 @@ init_invalid_configs(void) {
configs[26].empty_reserve = -0.0000000001f;
/* 27 -- empty_reserve too big */
- configs[27].empty_reserve = 1.00000000001;
+ configs[27].empty_reserve = H5_DOUBLE(1.00000000001);
/* 28 -- upper_hr_threshold too small */
configs[28].upper_hr_threshold = -0.000000001f;
/* 29 -- upper_hr_threshold too big */
- configs[29].upper_hr_threshold = 1.00000001;
+ configs[29].upper_hr_threshold = H5_DOUBLE(1.00000001);
/* 30 -- upper_hr_threshold <= lower_hr_threshold */
configs[30].lower_hr_threshold = 0.9f;
diff --git a/test/direct_chunk.c b/test/direct_chunk.c
index 2e6cc68..6cf27c8 100644
--- a/test/direct_chunk.c
+++ b/test/direct_chunk.c
@@ -43,7 +43,7 @@
#define CHUNK_NX 4
#define CHUNK_NY 4
-#define DEFLATE_SIZE_ADJUST(s) (HDceil(((double)(s))*1.001)+12.0)
+#define DEFLATE_SIZE_ADJUST(s) (HDceil(((double)(s))*H5_DOUBLE(1.001))+H5_DOUBLE(12.0))
/* Temporary filter IDs used for testing */
#define H5Z_FILTER_BOGUS1 305
diff --git a/test/dsets.c b/test/dsets.c
index 38f8cae..70fab86 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -3168,18 +3168,18 @@ test_nbit_double(hid_t file)
*/
double orig_data[2][5] = {
{
- 1.6081706885101836e+60,
- -255.32099170994480,
- 1.2677579992621376e-61,
- 64568.289448797700,
- -1.0619721778839084e-75
+ H5_DOUBLE(1.6081706885101836e+60),
+ H5_DOUBLE(-255.32099170994480),
+ H5_DOUBLE(1.2677579992621376e-61),
+ H5_DOUBLE(64568.289448797700),
+ H5_DOUBLE(-1.0619721778839084e-75)
},
{
- 2.1499497833454840e+56,
- 6.6562295504670740e-3,
- -1.5747263393432150,
- 1.0711093225222612,
- -9.8971679387636870e-1
+ H5_DOUBLE(2.1499497833454840e+56),
+ H5_DOUBLE(6.6562295504670740e-3),
+ H5_DOUBLE(-1.5747263393432150),
+ H5_DOUBLE(1.0711093225222612),
+ H5_DOUBLE(-9.8971679387636870e-1)
}};
double new_data[2][5];
size_t precision, offset;
diff --git a/test/tattr.c b/test/tattr.c
index dab03a7..bcd8698 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -542,7 +542,7 @@ test_attr_flush(hid_t fapl)
ret=H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
CHECK(ret, FAIL, "H5Awrite");
- if(!H5_DBL_ABS_EQUAL(rdata, 0.0))
+ if(!H5_DBL_ABS_EQUAL(rdata, H5_DOUBLE(0.0)))
TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n",rdata,(double)0.0F);
ret=H5Fflush(fil, H5F_SCOPE_GLOBAL);
@@ -551,7 +551,7 @@ test_attr_flush(hid_t fapl)
ret=H5Aread(att, H5T_NATIVE_DOUBLE, &rdata);
CHECK(ret, FAIL, "H5Awrite");
- if(!H5_DBL_ABS_EQUAL(rdata, 0.0))
+ if(!H5_DBL_ABS_EQUAL(rdata, H5_DOUBLE(0.0)))
TestErrPrintf("attribute value wrong: rdata=%f, should be %f\n",rdata,(double)0.0F);
ret=H5Awrite(att, H5T_NATIVE_DOUBLE, &wdata);