diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-02 20:07:10 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-03-02 20:07:10 (GMT) |
| commit | 483185409e16ec83c24301e21bfdc92234506730 (patch) | |
| tree | e97c85158440c18965ce515b90ff5139e75566b1 /src/H5Dint.c | |
| parent | a074829c66d295ebd83b77aac9abc27ba4457e33 (diff) | |
| download | hdf5-483185409e16ec83c24301e21bfdc92234506730.zip hdf5-483185409e16ec83c24301e21bfdc92234506730.tar.gz hdf5-483185409e16ec83c24301e21bfdc92234506730.tar.bz2 | |
[svn-r18357] Description:
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/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) 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
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index bfe16f7..5a9c0ea 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -27,8 +27,10 @@ /* 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 */ #include "H5FOprivate.h" /* File objects */ #include "H5Iprivate.h" /* IDs */ #include "H5Lprivate.h" /* Links */ |