diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-07 04:17:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-07 04:17:35 (GMT) |
| commit | 9f60f016ab71cf8ce39c859fd9eb61c6fca35d63 (patch) | |
| tree | 0ddbcb2f8707b578af22c62748420b9e3c19177b /testpar | |
| parent | 504c67846e6a4cc5706403bf21a9ae4f07aae7b4 (diff) | |
| download | hdf5-9f60f016ab71cf8ce39c859fd9eb61c6fca35d63.zip hdf5-9f60f016ab71cf8ce39c859fd9eb61c6fca35d63.tar.gz hdf5-9f60f016ab71cf8ce39c859fd9eb61c6fca35d63.tar.bz2 | |
[svn-r15800] Description:
Bring file free space branch changes through r15795 into trunk, which
includes a fair bit of code cleanup & rearrangement along with a couple of
bug fixes also.
Tested on:
Mac OS X/32 10.5.5 (amazon) in debug mode
Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, 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 production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_cache.c | 2 | ||||
| -rw-r--r-- | testpar/t_coll_chunk.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 0a7cb72..c858e9b 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -2180,7 +2180,7 @@ expunge_entry(H5C_t * cache_ptr, if ( nerrors == 0 ) { result = H5AC_expunge_entry(file_ptr, -1, &(types[0]), - entry_ptr->header.addr); + entry_ptr->header.addr, H5AC__NO_FLAGS_SET); if ( result < 0 ) { diff --git a/testpar/t_coll_chunk.c b/testpar/t_coll_chunk.c index e9f8c11..fe0405e 100644 --- a/testpar/t_coll_chunk.c +++ b/testpar/t_coll_chunk.c @@ -707,11 +707,11 @@ coll_chunktest(const char* filename, NULL, NULL, NULL, NULL, NULL, NULL); VRFY((status >= 0),"testing property list inserted succeeded"); - prop_value = H5D_XFER_COLL_CHUNK_FIX; + prop_value = H5D_XFER_COLL_CHUNK_FIX; status = H5Pinsert2(xfer_plist, H5D_XFER_COLL_CHUNK_LINK_TO_MULTI_OPT, H5D_XFER_COLL_CHUNK_SIZE, &prop_value, NULL, NULL, NULL, NULL, NULL, NULL); VRFY((status >= 0),"testing property list inserted succeeded"); - + break; case API_LINK_FALSE: |