diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 05:40:15 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 05:40:15 (GMT) |
commit | ac446b613161a8bdcb80648a4b32f67ca2c4b04a (patch) | |
tree | 75cc244d1b111896328438c627ac241eb4d6cf94 /src/H5HFiblock.c | |
parent | ee27c063666c961d4d27aad0b1c7fff3f9e73426 (diff) | |
parent | de952f36472b1cb66c2021ed37fd8bdfe7e7ba4c (diff) | |
download | hdf5-ac446b613161a8bdcb80648a4b32f67ca2c4b04a.zip hdf5-ac446b613161a8bdcb80648a4b32f67ca2c4b04a.tar.gz hdf5-ac446b613161a8bdcb80648a4b32f67ca2c4b04a.tar.bz2 |
[svn-r18037] Description:
Bring r18035 from merge_metadata_journaling branch to trunk:
More "brush clearing" convergence between metadata_journaling branch
and the trunk.
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 (smirom) 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
Mac OS X/32 10.6.2 (amazon) in debug mode
Mac OS X/32 10.6.2 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5HFiblock.c')
-rw-r--r-- | src/H5HFiblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c index c6e22cc..c75a28a 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -1055,7 +1055,7 @@ done: /*------------------------------------------------------------------------- * Function: H5HF_man_iblock_protect * - * Purpose: Convenience wrapper around H5AC_protect on a indirect block + * Purpose: Convenience wrapper around H5AC_protect on an indirect block * * Return: Pointer to indirect block on success, NULL on failure * @@ -1146,7 +1146,7 @@ done: /*------------------------------------------------------------------------- * Function: H5HF_man_iblock_unprotect * - * Purpose: Convenience wrapper around H5AC_unprotect on a indirect block + * Purpose: Convenience wrapper around H5AC_unprotect on an indirect block * * Return: SUCCEED/FAIL * |