diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-04-29 19:28:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-04-29 19:28:23 (GMT) |
| commit | eb96132022da938d4b54ae4dd482919a178c4ee5 (patch) | |
| tree | e6cfc62b07e4c74fdbe3c65a659fbaf69ca5a322 /test/cache_common.c | |
| parent | 1032b7c9d6cbd0ac109b72add26d47436eaca035 (diff) | |
| download | hdf5-eb96132022da938d4b54ae4dd482919a178c4ee5.zip hdf5-eb96132022da938d4b54ae4dd482919a178c4ee5.tar.gz hdf5-eb96132022da938d4b54ae4dd482919a178c4ee5.tar.bz2 | |
[svn-r12316] Purpose:
Code cleanup/feature twist
Description:
Adjust recent H5AC routines to take H5F_t pointers instead of H5C_t
pointers, to match the rest of the H5AC routines.
This change propagated into a few of the tests, which also had some
compiler warnings cleaned up...
Platforms tested:
FreeBSD 4.11 (sleipnir) w/parallel
Linux 2.4/64 (mir) w/C++ & FORTRAN
Diffstat (limited to 'test/cache_common.c')
| -rw-r--r-- | test/cache_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cache_common.c b/test/cache_common.c index 55276d0..26bddf0 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -340,7 +340,7 @@ type_and_index_to_addr(int32_t type, /*------------------------------------------------------------------------- * - * Function: H5AC_check_if_write_permitted + * Function: check_if_write_permitted * * Purpose: Determine if a write is permitted under the current * circumstances, and set *write_permitted_ptr accordingly. @@ -2021,7 +2021,7 @@ unprotect_entry(H5C_t * cache_ptr, if ( ( dirty == TRUE ) || ( dirty == FALSE ) ) { - flags |= (dirty ? H5AC__DIRTIED_FLAG : H5AC__NO_FLAGS_SET); + flags |= (dirty ? H5C__DIRTIED_FLAG : H5C__NO_FLAGS_SET); entry_ptr->is_dirty = (entry_ptr->is_dirty || dirty); } @@ -2058,7 +2058,7 @@ unprotect_entry(H5C_t * cache_ptr, HDassert( ((entry_ptr->header).type)->id == type ); - if ( ( flags & H5AC__DIRTIED_FLAG ) != 0 + if ( ( flags & H5C__DIRTIED_FLAG ) != 0 && ( (flags & H5C__DELETED_FLAG) == 0 ) ) { HDassert( entry_ptr->header.is_dirty ); |