diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2014-03-21 22:31:09 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2014-03-21 22:31:09 (GMT) |
| commit | 525ed252e286a9d81f20dc355cf069b93968f8c2 (patch) | |
| tree | 85890d0cc19cb83629c99a537215e06f99e6162c /test/fheap.c | |
| parent | a49d7650ac46ef8fdb124176154d0aefdc23629b (diff) | |
| parent | f5689224b5faaf01c02a1a4ae2a0a71b9f46e1d0 (diff) | |
| download | hdf5-525ed252e286a9d81f20dc355cf069b93968f8c2.zip hdf5-525ed252e286a9d81f20dc355cf069b93968f8c2.tar.gz hdf5-525ed252e286a9d81f20dc355cf069b93968f8c2.tar.bz2 | |
[svn-r24863] Merge r24602 through r24792 to multi_rd_wd_coll_io branch
Enable collective I/O for point selections in multi dataset calls
Other minor cleanup
Tested: ummon
Diffstat (limited to 'test/fheap.c')
| -rw-r--r-- | test/fheap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/fheap.c b/test/fheap.c index e4aa137..96b0673 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -29,7 +29,7 @@ /* Other private headers that this test requires */ #include "H5Iprivate.h" /* IDs */ #include "H5MMprivate.h" /* Memory management */ -#include "H5Vprivate.h" /* Vectors and arrays */ +#include "H5VMprivate.h" /* Vectors and arrays */ /* Max. testfile name length */ #define FHEAP_FILENAME_LEN 1024 @@ -1574,7 +1574,7 @@ fill_all_2nd_indirect_rows(H5HF_t *fh, hid_t dxpl, size_t obj_size, width = DTABLE_WIDTH(fh); /* Loop over rows of 2nd level deep indirect blocks */ - for(u = 0; u < (H5V_log2_of2(width) + 1); u++) + for(u = 0; u < (H5VM_log2_of2(width) + 1); u++) if(fill_2nd_indirect_row(fh, dxpl, (u + 1), obj_size, state, keep_ids)) TEST_ERROR @@ -1692,7 +1692,7 @@ fill_all_3rd_indirect_rows(H5HF_t *fh, hid_t dxpl, size_t obj_size, width = DTABLE_WIDTH(fh); /* Loop over rows of 3rd level deep indirect blocks */ - for(u = 0; u < (H5V_log2_of2(width) + 1); u++) + for(u = 0; u < (H5VM_log2_of2(width) + 1); u++) /* Fill row of 3rd level indirect blocks */ if(fill_3rd_indirect_row(fh, dxpl, (u + 1), obj_size, state, keep_ids)) TEST_ERROR @@ -1782,7 +1782,7 @@ fill_all_4th_indirect_rows(H5HF_t *fh, hid_t dxpl, size_t obj_size, width = DTABLE_WIDTH(fh); /* Loop over rows of 4th level deep indirect blocks */ - for(u = 0; u < (H5V_log2_of2(width) + 1); u++) { + for(u = 0; u < (H5VM_log2_of2(width) + 1); u++) { /* Fill row of 4th level indirect blocks */ if(fill_4th_indirect_row(fh, dxpl, (u + 1), obj_size, state, keep_ids)) TEST_ERROR |