diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-26 14:51:47 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-06-26 14:51:47 (GMT) |
| commit | 4a951a53063efa51d3dba672dccd8a59be78ac8f (patch) | |
| tree | d66d2833fdd3e4a1b83e9521b957e99945c82659 /test/cache_tagging.c | |
| parent | 79fe6d27f022b0124782d6e0c6eb345f2e669095 (diff) | |
| parent | df8bd7ccd6cd8d50280a3a7d862064c6340e2169 (diff) | |
| download | hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.zip hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.tar.gz hdf5-4a951a53063efa51d3dba672dccd8a59be78ac8f.tar.bz2 | |
[svn-r27286] merge from trunk.
Diffstat (limited to 'test/cache_tagging.c')
| -rw-r--r-- | test/cache_tagging.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cache_tagging.c b/test/cache_tagging.c index 04752ac..bc44f23 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -457,7 +457,7 @@ static int evict_entries(hid_t fid) /* Evict all we can from the cache to examine full tag creation tree */ /* This function will likely return failure since the root group * is still protected. Thus, don't check its return value. */ - H5C_flush_cache(f, H5P_DEFAULT, H5P_DEFAULT, H5C__FLUSH_INVALIDATE_FLAG); + H5C_flush_cache(f, H5P_DEFAULT, H5C__FLUSH_INVALIDATE_FLAG); return 0; @@ -3866,13 +3866,13 @@ check_invalid_tag_application(void) /* Call H5HL_protect to protect the local heap created above. */ /* This should fail as no tag is set up during the protect call */ - if (( lheap = H5HL_protect(f, H5AC_ind_dxpl_id, addr, H5AC_WRITE)) != NULL ) TEST_ERROR; + if (( lheap = H5HL_protect(f, H5AC_ind_dxpl_id, addr, H5AC__NO_FLAGS_SET)) != NULL ) TEST_ERROR; /* Again, set up a valid tag in the DXPL */ if ( H5AC_tag(H5AC_ind_dxpl_id, (haddr_t)25, NULL) < 0) TEST_ERROR; /* Call H5HL_protect again to protect the local heap. This should succeed. */ - if (( lheap = H5HL_protect(f, H5AC_ind_dxpl_id, addr, H5AC_WRITE)) == NULL ) TEST_ERROR; + if (( lheap = H5HL_protect(f, H5AC_ind_dxpl_id, addr, H5AC__NO_FLAGS_SET)) == NULL ) TEST_ERROR; /* Now unprotect the heap, as we're done with the test. */ if ( H5HL_unprotect(lheap) < 0 ) TEST_ERROR; |