diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 03:48:44 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-30 03:48:44 (GMT) |
commit | aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c (patch) | |
tree | b38d4820a999a8960164505dc020e3f6de30c85a /src/H5Oprivate.h | |
parent | 31a7cd56bfdb08646d9638fdabb576b3af38fc11 (diff) | |
download | hdf5-aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c.zip hdf5-aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c.tar.gz hdf5-aaa84b4542fba4b3d8424bf494b311a8ab0dbd4c.tar.bz2 |
[svn-r17274] Description:
Bring r17272 from trunk to 1.8 branch:
Finish pushing contiguous storage size from 'layout' into 'storage"
data structure.
Tested on:
Mac OS X/32 10.5.7 (amazon) w/debug & production
Too minor to require h5committest
Diffstat (limited to 'src/H5Oprivate.h')
-rw-r--r-- | src/H5Oprivate.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h index 3f05abf..7888e1f 100644 --- a/src/H5Oprivate.h +++ b/src/H5Oprivate.h @@ -348,6 +348,7 @@ struct H5D_chunk_ops_t; /* Defined in H5Dpkg.h */ typedef struct H5O_storage_contig_t { haddr_t addr; /* File address of data */ + hsize_t size; /* Size of data in bytes */ } H5O_storage_contig_t; typedef struct H5O_storage_chunk_t { @@ -369,10 +370,6 @@ typedef struct H5O_storage_t { } u; } H5O_storage_t; -typedef struct H5O_layout_contig_t { - hsize_t size; /* Size of data in bytes */ -} H5O_layout_contig_t; - typedef struct H5O_layout_chunk_btree_t { H5RC_t *shared; /* Ref-counted shared info for B-tree nodes */ } H5O_layout_chunk_btree_t; @@ -396,7 +393,6 @@ typedef struct H5O_layout_t { unsigned version; /* Version of message */ const struct H5D_layout_ops_t *ops; /* Pointer to data layout I/O operations */ union { - H5O_layout_contig_t contig; /* Information for contiguous layout */ H5O_layout_chunk_t chunk; /* Information for chunked layout */ } u; H5O_storage_t store; /* Information for storing dataset elements */ |