diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-01-09 03:40:32 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-01-09 03:40:32 (GMT) |
| commit | 887aa3d05d0a64e1c8198138334c0fe761d0ab2f (patch) | |
| tree | f76830792c4ebde1d4cf96810dfce70cc07808cb /test/h5test.c | |
| parent | 78f0ecc3b98c77b4293c02e78d158a8385513d37 (diff) | |
| download | hdf5-887aa3d05d0a64e1c8198138334c0fe761d0ab2f.zip hdf5-887aa3d05d0a64e1c8198138334c0fe761d0ab2f.tar.gz hdf5-887aa3d05d0a64e1c8198138334c0fe761d0ab2f.tar.bz2 | |
Merge of --Wc++-compat changes from develop
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 3cc2c35..25a4e6c 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -231,7 +231,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); } @@ -941,7 +941,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]); @@ -953,7 +953,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 */ @@ -1286,7 +1286,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]); |