diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-09 22:16:23 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-09 22:16:23 (GMT) |
| commit | 6710ed5e0a03de50a5679c92437df82893da6813 (patch) | |
| tree | d386f1bfa160f84be4c7963b2506dc1c1599667d /tools | |
| parent | de28f691ba42e295341ed1098caa1f3b980cc4eb (diff) | |
| parent | e05fe70195edb8be9b3e297a37e65e49b226ade2 (diff) | |
| download | hdf5-6710ed5e0a03de50a5679c92437df82893da6813.zip hdf5-6710ed5e0a03de50a5679c92437df82893da6813.tar.gz hdf5-6710ed5e0a03de50a5679c92437df82893da6813.tar.bz2 | |
Merge branch 'hdf5_1_10' of https://git.hdfgroup.org/scm/~kmu/hdf5 into hdf5_1_10
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/test/h5dump/h5dumpgentest.c | 2 | ||||
| -rw-r--r-- | tools/test/perform/sio_engine.c | 4 | ||||
| -rw-r--r-- | tools/test/perform/sio_standalone.h | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c index ce27a36..220937d 100644 --- a/tools/test/h5dump/h5dumpgentest.c +++ b/tools/test/h5dump/h5dumpgentest.c @@ -3759,7 +3759,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/perform/sio_engine.c b/tools/test/perform/sio_engine.c index 488f575..fe9c2a1 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) |