From 9b014e94ed2e5b9bef8b1687879913afbfd319aa Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Fri, 13 Dec 2019 12:45:26 -0600 Subject: Correct Merge issue --- test/cache.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/cache.c b/test/cache.c index ca2cf13..ec5f6f4 100644 --- a/test/cache.c +++ b/test/cache.c @@ -36640,7 +36640,7 @@ setup_cache(size_t max_cache_size, HDfprintf(stdout, "%s: H5Fflush() failed.\n", FUNC); } else { - file_ptr = (H5F_t *)H5VL_object_verify(fid, H5I_FILE); + file_ptr = (H5F_t *)H5I_object_verify(fid, H5I_FILE); if(file_ptr == NULL) { pass = FALSE; failure_mssg = "Can't get file_ptr."; @@ -36836,7 +36836,7 @@ takedown_cache(H5F_t * file_ptr, if ( H5F_addr_defined(saved_actual_base_addr) ) { if ( NULL == file_ptr ) { - file_ptr = (H5F_t *)H5VL_object_verify(saved_fid, H5I_FILE); + file_ptr = (H5F_t *)H5I_object_verify(saved_fid, H5I_FILE); HDassert ( file_ptr ); } @@ -36881,6 +36881,7 @@ takedown_cache(H5F_t * file_ptr, } /* takedown_cache() */ + /*------------------------------------------------------------------------- * Function: main * -- cgit v0.12