diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-02-13 22:12:46 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-02-13 22:12:46 (GMT) |
| commit | 863ff882b619e8d2c3ad3bdb659f14fa2e9d07d3 (patch) | |
| tree | 6d5178a9d319ea01836853807e2ef21178a3c819 /src/H5HFdblock.c | |
| parent | 49a9979166bfe78638fe53dc49b6644ff0946b10 (diff) | |
| download | hdf5-863ff882b619e8d2c3ad3bdb659f14fa2e9d07d3.zip hdf5-863ff882b619e8d2c3ad3bdb659f14fa2e9d07d3.tar.gz hdf5-863ff882b619e8d2c3ad3bdb659f14fa2e9d07d3.tar.bz2 | |
[svn-r24709] rename H5V to H5VM since H5V is needed in the fastforward project for
view objects. The addition of view objects in the fastforward project
is expected to be brough into the trunk sometimes in the future, which
is why we need to make this change.
Tested Manually on Jam and Ostrich.
Tested with h5commitest - Koala with intel compilers failed, but nothing had to do with those changes.
error on Koala: error while loading shared libraries: libirng.so
Diffstat (limited to 'src/H5HFdblock.c')
| -rw-r--r-- | src/H5HFdblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index afc7f25..dd36613 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -38,7 +38,7 @@ #include "H5Fprivate.h" /* File access */ #include "H5HFpkg.h" /* Fractal heaps */ #include "H5MFprivate.h" /* File memory management */ -#include "H5Vprivate.h" /* Vectors and arrays */ +#include "H5VMprivate.h" /* Vectors and arrays */ /****************/ /* Local Macros */ @@ -354,7 +354,7 @@ H5HF_man_dblock_new(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t request, if(request < hdr->man_dtable.cparam.start_block_size) min_dblock_size = hdr->man_dtable.cparam.start_block_size; else { - min_dblock_size = ((size_t)1) << (1 + H5V_log2_gen((uint64_t)request)); + min_dblock_size = ((size_t)1) << (1 + H5VM_log2_gen((uint64_t)request)); HDassert(min_dblock_size <= hdr->man_dtable.cparam.max_direct_size); } /* end else */ @@ -549,7 +549,7 @@ H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off, unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting parent indirect block */ /* Compute # of rows in child indirect block */ - nrows = (H5V_log2_gen(hdr->man_dtable.row_block_size[row]) - hdr->man_dtable.first_row_bits) + 1; + nrows = (H5VM_log2_gen(hdr->man_dtable.row_block_size[row]) - hdr->man_dtable.first_row_bits) + 1; HDassert(nrows < iblock->nrows); /* child must be smaller than parent */ /* Compute indirect block's entry */ |