diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-17 14:54:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-17 14:54:04 (GMT) |
| commit | ed23b6baad3d6d8c1f2b70754dbbb3da251ccb0e (patch) | |
| tree | a269e21770a3b606907cebe923522ae393167800 /tools | |
| parent | 0ea37eb9306bb703790a163cc6d1f410a2778bec (diff) | |
| parent | 1097ac60c2b95a2b958a3150b537c75f512cacca (diff) | |
| download | hdf5-ed23b6baad3d6d8c1f2b70754dbbb3da251ccb0e.zip hdf5-ed23b6baad3d6d8c1f2b70754dbbb3da251ccb0e.tar.gz hdf5-ed23b6baad3d6d8c1f2b70754dbbb3da251ccb0e.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_12)
* commit '1097ac60c2b95a2b958a3150b537c75f512cacca':
Merge t_2Gio test into hdf5_1_12. This will eventually be refactored out after merging the test functionality into the testphdf5 test.
Merge t_2Gio test into hdf5_1_12. This will eventually be refactored out after merging the test functionality into the testphdf5 test.
Minor tweaks noticed while going over VOL documentation.
Yanked -Wc++-compat from the flags used to build the C library in both the Autotools and CMake.
Fixed missing blob callbacks in test VOL connectors.
Trivial parameter renaming in VOL API calls.
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 ad70770..4ceed73 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/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) |