diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 17:51:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 17:51:49 (GMT) |
| commit | e1ceea54ff06ffef0029b20007cd7685e000fdec (patch) | |
| tree | 3aacc0bfbc6762d7c28f53df2183b797e9d32854 /src/H5Dlayout.c | |
| parent | f0ce4df67f82ee7308ad812a1772079fcb141182 (diff) | |
| download | hdf5-e1ceea54ff06ffef0029b20007cd7685e000fdec.zip hdf5-e1ceea54ff06ffef0029b20007cd7685e000fdec.tar.gz hdf5-e1ceea54ff06ffef0029b20007cd7685e000fdec.tar.bz2 | |
[svn-r17275] Description:
Refactor dataet storage information further, moving the chunk operations
into the storage struct and also fine-tune the chunk index structure for index
callbacks.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.7 (amazon) in debug mode
Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5Dlayout.c')
| -rw-r--r-- | src/H5Dlayout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c index 6e7686b..8e139ae 100644 --- a/src/H5Dlayout.c +++ b/src/H5Dlayout.c @@ -96,8 +96,8 @@ H5D_layout_set_io_ops(const H5D_t *dataset) dataset->shared->layout.ops = H5D_LOPS_CHUNK; /* Set the chunk operations */ - /* (Only "B-tree" indexing type currently supported */ - dataset->shared->layout.u.chunk.ops = H5D_COPS_BTREE; + /* (Only "B-tree" indexing type currently supported) */ + dataset->shared->layout.storage.u.chunk.ops = H5D_COPS_BTREE; break; case H5D_COMPACT: @@ -147,7 +147,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: @@ -407,7 +407,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 */ |