diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-02 20:13:22 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-02 20:13:22 (GMT) |
commit | 68c936cd239f860eff477636abe0e6bf388a92d7 (patch) | |
tree | 6075c8c5a84e3538d0ef6a7b6aea3fb4ce100fa8 /src/H5D.c | |
parent | 48142bf5fd0d75ff44c2736a919f41ea4e3d4216 (diff) | |
download | hdf5-68c936cd239f860eff477636abe0e6bf388a92d7.zip hdf5-68c936cd239f860eff477636abe0e6bf388a92d7.tar.gz hdf5-68c936cd239f860eff477636abe0e6bf388a92d7.tar.bz2 |
[svn-r18358] Description:
Bring r18357 from trunk to 1.8 branch:
Bring r18356 from metadata journaling merge branch to trunk:
Converge metadata journaling branch with trunk with a bunch of v1 B-tree
changes:
- Remove H5ACprivate.h header from H5Bprivate.h header
- Revise v1 B-tree client callbacks
- Get rid of H5B_serialize() by bringing it into H5B_flush()
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5D.c')
-rw-r--r-- | src/H5D.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -27,6 +27,7 @@ /* Headers */ /***********/ #include "H5private.h" /* Generic Functions */ +#include "H5ACprivate.h" /* Metadata cache */ #include "H5Dpkg.h" /* Datasets */ #include "H5Eprivate.h" /* Error handling */ #include "H5FLprivate.h" /* Free lists */ |