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 /test/cache_common.c | |
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 'test/cache_common.c')
-rw-r--r-- | test/cache_common.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/test/cache_common.c b/test/cache_common.c index cce87a9..12001b2 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -19,7 +19,6 @@ * This file contains common code for tests of the cache * implemented in H5C.c */ -#include "H5private.h" /* Put this first, so H5open() isn't invoked in public macros */ #include "h5test.h" #include "H5Cprivate.h" #include "H5Iprivate.h" @@ -799,7 +798,6 @@ notify_dest(H5F_t * f, void * thing) * *------------------------------------------------------------------------- */ - herr_t flush(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, @@ -871,7 +869,6 @@ flush(H5F_t *f, } return(SUCCEED); - } /* flush() */ herr_t @@ -962,7 +959,6 @@ notify_flush(H5F_t *f, hid_t dxpl_id, hbool_t dest, haddr_t addr, return(flush(f, dxpl_id, dest, addr, thing, flags_ptr)); } - /*------------------------------------------------------------------------- * Function: load & friends @@ -1108,7 +1104,6 @@ notify_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata) * *------------------------------------------------------------------------- */ - herr_t size(H5F_t H5_ATTR_UNUSED * f, void * thing, @@ -1134,7 +1129,6 @@ size(H5F_t H5_ATTR_UNUSED * f, *size_ptr = entry_ptr->size; return(SUCCEED); - } /* size() */ herr_t |