summaryrefslogtreecommitdiffstats
path: root/src/H5Olayout.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-02-22 12:16:30 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-02-22 12:16:30 (GMT)
commitc07d8036591313caf15cf626122bd7ce4e61be49 (patch)
treede3cfcb2639a3c84254d536d2f4a1ec9239af019 /src/H5Olayout.c
parent179f3b7879e28165869034255b5852b551700ad6 (diff)
parentf634105bdb7c494a5ab39291d64c00676c11b476 (diff)
downloadhdf5-c07d8036591313caf15cf626122bd7ce4e61be49.zip
hdf5-c07d8036591313caf15cf626122bd7ce4e61be49.tar.gz
hdf5-c07d8036591313caf15cf626122bd7ce4e61be49.tar.bz2
[svn-r26274] Merge of r26096 to r26271 from trunk.
Tested on: jam - serial: C++/Fortran parallel: Fortran
Diffstat (limited to 'src/H5Olayout.c')
-rw-r--r--src/H5Olayout.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 4c43873..816242f 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -147,7 +147,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
/* Set the chunk operations */
/* (Only "btree" indexing type currently supported in this version) */
- mesg->storage.u.chunk.idx_type = H5D_CHUNK_BTREE;
+ mesg->storage.u.chunk.idx_type = H5D_CHUNK_IDX_BTREE;
mesg->storage.u.chunk.ops = H5D_COPS_BTREE;
} /* end if */
else {
@@ -234,7 +234,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
/* Set the chunk operations */
/* (Only "btree" indexing type supported with v3 of message format) */
- mesg->storage.u.chunk.idx_type = H5D_CHUNK_BTREE;
+ mesg->storage.u.chunk.idx_type = H5D_CHUNK_IDX_BTREE;
mesg->storage.u.chunk.ops = H5D_COPS_BTREE;
/* Set the layout operations */
@@ -715,7 +715,7 @@ H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg,
/* Index information */
switch(mesg->storage.u.chunk.idx_type) {
- case H5D_CHUNK_BTREE:
+ case H5D_CHUNK_IDX_BTREE:
HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"Index Type:", "v1 B-tree");
HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,