diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2015-02-24 21:53:56 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2015-02-24 21:53:56 (GMT) |
| commit | 2ca5b16a9fd79d240d5e4ebe4689033c6c7182ad (patch) | |
| tree | 30e44b12fa5cfd92d8524fcf2717e19ec21e2043 /src/H5Olayout.c | |
| parent | 3f72ec11cdd07c30ee0340e3c1e9b13d88495807 (diff) | |
| parent | 48d9c30923a5d298670cf1f8e930c9a9624f80b9 (diff) | |
| download | hdf5-2ca5b16a9fd79d240d5e4ebe4689033c6c7182ad.zip hdf5-2ca5b16a9fd79d240d5e4ebe4689033c6c7182ad.tar.gz hdf5-2ca5b16a9fd79d240d5e4ebe4689033c6c7182ad.tar.bz2 | |
[svn-r26296] Merge r26050 through 26295 from trunk to vds branch.
Tested: ummon
Diffstat (limited to 'src/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 9d4fff7..8fc1650 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -148,7 +148,7 @@ H5O_layout_decode(H5F_t *f, hid_t 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 { @@ -235,7 +235,7 @@ H5O_layout_decode(H5F_t *f, hid_t 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 */ @@ -932,7 +932,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, |