summaryrefslogtreecommitdiffstats
path: root/src/H5ACprivate.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2013-10-07 22:04:27 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2013-10-07 22:04:27 (GMT)
commit3a96de8b17df2964f4ad7da5c9742b3bd71b3c38 (patch)
tree93e44fbe16b9b6227fb28f7f415939a1e1602237 /src/H5ACprivate.h
parent307f88870c18d050912cb7bb614480420a794a9c (diff)
downloadhdf5-3a96de8b17df2964f4ad7da5c9742b3bd71b3c38.zip
hdf5-3a96de8b17df2964f4ad7da5c9742b3bd71b3c38.tar.gz
hdf5-3a96de8b17df2964f4ad7da5c9742b3bd71b3c38.tar.bz2
[svn-r24262] Description:
Bring r24256 & r24261 from trunk to 1.8 branch: Switch H5I internal data structure from using hash table to skip lists. Also, a few misc. cleanups. Tested on: FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode FreeBSD/64 8.2 (freedom) w/gcc4.6, 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 (koala) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.11 (emu) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, w/threadsafe, in production mode Linux/PPC 2.6 (ostrich) w/C++ & FORTRAN, w/threadsafe, in debug mode
Diffstat (limited to 'src/H5ACprivate.h')
-rw-r--r--src/H5ACprivate.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 68412a0..2e7bcd7 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -319,8 +319,7 @@ H5_DLL herr_t H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *typ
haddr_t addr, void *thing, unsigned int flags);
H5_DLL herr_t H5AC_pin_protected_entry(void *thing);
H5_DLL void * H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type,
- haddr_t addr, void *udata,
- H5AC_protect_t rw);
+ haddr_t addr, void *udata, H5AC_protect_t rw);
H5_DLL herr_t H5AC_resize_entry(void *thing, size_t new_size);
H5_DLL herr_t H5AC_unpin_entry(void *thing);
H5_DLL herr_t H5AC_unprotect(H5F_t *f, hid_t dxpl_id,