diff options
| author | kmu <kmu@hdfgroup.org> | 2019-12-09 15:18:56 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2019-12-09 15:18:56 (GMT) |
| commit | 8b51394f3841012f3c06bf380082a83f66a68168 (patch) | |
| tree | cfb41461a5f1f9bc14e8f3118ce541e1997aa485 /tools/test | |
| parent | 189935ff260cae6fb4e061fa68bd7b93e219c635 (diff) | |
| parent | 1f871e23b7c3fdec925004f2cd39d3a2cdd8decb (diff) | |
| download | hdf5-8b51394f3841012f3c06bf380082a83f66a68168.zip hdf5-8b51394f3841012f3c06bf380082a83f66a68168.tar.gz hdf5-8b51394f3841012f3c06bf380082a83f66a68168.tar.bz2 | |
Merge branch 'develop' into bugfix/intel_warnings
Diffstat (limited to 'tools/test')
| -rw-r--r-- | tools/test/h5dump/h5dumpgentest.c | 2 | ||||
| -rw-r--r-- | tools/test/h5repack/h5repackgentest.c | 1 | ||||
| -rw-r--r-- | tools/test/perform/sio_engine.c | 4 | ||||
| -rw-r--r-- | tools/test/perform/sio_standalone.h | 7 |
4 files changed, 4 insertions, 10 deletions
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c index ed0287c..6cf2916 100644 --- a/tools/test/h5dump/h5dumpgentest.c +++ b/tools/test/h5dump/h5dumpgentest.c @@ -3760,7 +3760,7 @@ void gent_multi(void) HDassert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES); - for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) { + for(mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { memb_fapl[mt] = H5P_DEFAULT; memb_map[mt] = mt; HDsprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]); diff --git a/tools/test/h5repack/h5repackgentest.c b/tools/test/h5repack/h5repackgentest.c index 80f1518..c2398b6 100644 --- a/tools/test/h5repack/h5repackgentest.c +++ b/tools/test/h5repack/h5repackgentest.c @@ -314,6 +314,7 @@ generate_f32le(hbool_t external) { int main(void) { int i = 0; + int ret_value = 0; for (i = 0; i < 2; i++) { hbool_t external = (i & 1) ? TRUE : FALSE; diff --git a/tools/test/perform/sio_engine.c b/tools/test/perform/sio_engine.c index 07a39cb..4dc4d0b 100644 --- a/tools/test/perform/sio_engine.c +++ b/tools/test/perform/sio_engine.c @@ -1174,7 +1174,7 @@ set_vfd(parameters *param) HDmemset(memb_addr, 0, sizeof memb_addr); HDassert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES); - for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) { + for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) { memb_fapl[mt] = H5P_DEFAULT; HDsprintf(sv[mt], "%%s-%c.h5", multi_letters[mt]); memb_name[mt] = sv[mt]; @@ -1312,7 +1312,7 @@ do_cleanupfile(iotype iot, char *filename) H5FD_mem_t mt; assert(HDstrlen(multi_letters)==H5FD_MEM_NTYPES); - for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; H5_INC_ENUM(H5FD_mem_t,mt)) { + for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { HDsnprintf(temp, sizeof temp, "%s-%c.h5", filename, multi_letters[mt]); HDremove(temp); /*don't care if it fails*/ diff --git a/tools/test/perform/sio_standalone.h b/tools/test/perform/sio_standalone.h index 5ce922b..248ef9a 100644 --- a/tools/test/perform/sio_standalone.h +++ b/tools/test/perform/sio_standalone.h @@ -47,13 +47,6 @@ #define MAX3(a,b,c) MAX(a,MAX(b,c)) #define MAX4(a,b,c,d) MAX(MAX(a,b),MAX(c,d)) -/* - * A macro to portably increment enumerated types. - */ -#ifndef H5_INC_ENUM -# define H5_INC_ENUM(TYPE,VAR) (VAR)=((TYPE)((VAR)+1)) -#endif - #define H5_FLT_ABS_EQUAL(X,Y) (HDfabsf((X)-(Y)) < FLT_EPSILON) #define H5_DBL_ABS_EQUAL(X,Y) (HDfabs ((X)-(Y)) < DBL_EPSILON) #define H5_LDBL_ABS_EQUAL(X,Y) (HDfabsl((X)-(Y)) < LDBL_EPSILON) |