diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-05 15:30:11 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-05 15:30:11 (GMT) |
| commit | 4747e2f2ad58bd00878a5c669df3ea7f02eabb5a (patch) | |
| tree | 019cdae03d8f7e5f38957fceadffc1df7e7b32ef /test/h5test.c | |
| parent | 4f74548f53301520b476b4dba9f473ca139c5df2 (diff) | |
| parent | c7b3d6d6a5c1d376812e17c0ddb26f55334a2c59 (diff) | |
| download | hdf5-4747e2f2ad58bd00878a5c669df3ea7f02eabb5a.zip hdf5-4747e2f2ad58bd00878a5c669df3ea7f02eabb5a.tar.gz hdf5-4747e2f2ad58bd00878a5c669df3ea7f02eabb5a.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'c7b3d6d6a5c1d376812e17c0ddb26f55334a2c59':
Yanked -Wc++-compat from the flags used to build the C library in both the Autotools and CMake.
Diffstat (limited to 'test/h5test.c')
| -rw-r--r-- | test/h5test.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/h5test.c b/test/h5test.c index c8f4132..67c73f1 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -237,7 +237,7 @@ h5_delete_test_file(const char *base_name, hid_t fapl) 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++) { HDsnprintf(sub_filename, sizeof(sub_filename), "%s-%c.h5", filename, multi_letters[mt]); HDremove(sub_filename); } @@ -990,7 +990,7 @@ h5_get_vfd_fapl(hid_t fapl) 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; sv[mt] = (char *)HDmalloc(H5TEST_MULTI_FILENAME_LEN); HDassert(sv[mt]); @@ -1002,7 +1002,7 @@ h5_get_vfd_fapl(hid_t fapl) if(H5Pset_fapl_multi(fapl, memb_map, memb_fapl, memb_name, memb_addr, FALSE) < 0) goto error; - 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++) HDfree(sv[mt]); } else if(!HDstrcmp(tok, "family")) { /* Family of files, each 1MB and using the default driver */ @@ -1398,7 +1398,7 @@ h5_get_file_size(const char *filename, hid_t fapl) h5_stat_size_t tot_size = 0; 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++) { /* Create the filename to query */ HDsnprintf(temp, sizeof temp, "%s-%c.h5", filename, multi_letters[mt]); |