diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 19:51:19 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 19:51:19 (GMT) |
| commit | 52df94498eb662577b47303e8a750d35cc427183 (patch) | |
| tree | a19c090c31b287f9819b165003e75a3518082adb /src/H5Dlayout.c | |
| parent | eceb405b87abaa4484df4b94d9461ce6dce45890 (diff) | |
| download | hdf5-52df94498eb662577b47303e8a750d35cc427183.zip hdf5-52df94498eb662577b47303e8a750d35cc427183.tar.gz hdf5-52df94498eb662577b47303e8a750d35cc427183.tar.bz2 | |
[svn-r17278] Description:
Bring r17272:17276 from trunk to revise_chunks branch.
tested on:
FreeBSD/32 6.3 (duty)
h5committest not required on this branch
Diffstat (limited to 'src/H5Dlayout.c')
| -rw-r--r-- | src/H5Dlayout.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c index b2c0ede..853f902 100644 --- a/src/H5Dlayout.c +++ b/src/H5Dlayout.c @@ -98,15 +98,15 @@ H5D_layout_set_io_ops(const H5D_t *dataset) /* Set the chunk operations */ switch(dataset->shared->layout.u.chunk.idx_type) { case H5D_CHUNK_IDX_BTREE: - dataset->shared->layout.u.chunk.ops = H5D_COPS_BTREE; + dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_BTREE; break; case H5D_CHUNK_IDX_FARRAY: - dataset->shared->layout.u.chunk.ops = H5D_COPS_FARRAY; + dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_FARRAY; break; case H5D_CHUNK_IDX_EARRAY: - dataset->shared->layout.u.chunk.ops = H5D_COPS_EARRAY; + dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_EARRAY; break; default: @@ -162,7 +162,7 @@ H5D_layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include /* Size of raw data */ ret_value += 2; if(include_compact_data) - ret_value += layout->store.u.compact.size;/* data for compact dataset */ + ret_value += layout->storage.u.compact.size;/* data for compact dataset */ break; case H5D_CONTIGUOUS: @@ -564,7 +564,7 @@ H5D_layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t HGOTO_ERROR(H5E_DATASET, H5E_OVERFLOW, FAIL, "size of dataset's storage overflowed") /* Assign the dataset's contiguous storage size */ - dataset->shared->layout.store.u.contig.size = tmp_size; + dataset->shared->layout.storage.u.contig.size = tmp_size; } /* end if */ /* Get the sieve buffer size for this dataset */ |