diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-06-03 15:35:28 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-06-03 15:35:28 (GMT) |
commit | 235b3b86c1eabefcf6c4de9594a5609b6f03060b (patch) | |
tree | ad92ab59e8545694bd914be12f46dc501f1963a0 /testpar | |
parent | e2fa1a7555ea0c548824c33f84a5e5c9efd1b938 (diff) | |
download | hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.zip hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.tar.gz hdf5-235b3b86c1eabefcf6c4de9594a5609b6f03060b.tar.bz2 |
[svn-r27144] Description:
Normalize trunk against the metadata_cache_merge branch, in preparation
for merging the branch into the trunk.
Tested on:
MacOSX/64 10.10.3 (amazon) w/serial & parallel
Linux/64 2.6.x (koala) w/serial
Linux/32 2.6.x (jam) w/serial & parallel
Diffstat (limited to 'testpar')
-rw-r--r-- | testpar/t_cache.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 91c1113..02792b1 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -31,6 +31,7 @@ #include "H5Iprivate.h" +#define BASE_ADDR (haddr_t)512 int nerrors = 0; @@ -767,7 +768,7 @@ init_data(void) 1974, 3194, 5168, 8362, 13539}; int i; int j = 0; - haddr_t addr = 512; + haddr_t addr = BASE_ADDR; /* this must hold so moves don't change entry size. */ HDassert( (NUM_DATA_ENTRIES / 2) % 20 == 0 ); @@ -4709,7 +4710,7 @@ verify_total_writes(int expected_total_writes) * Updated for the new local_len field in datum. * *****************************************************************************/ -void +static void unlock_entry(H5F_t * file_ptr, int32_t idx, unsigned int flags) |