diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2004-07-03 17:00:01 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-07-03 17:00:01 (GMT) |
commit | 153444fed7bd9dfb2b7d90a47c79d11bd1188e96 (patch) | |
tree | ec623ec5a7ebeca40c7195d2f698c9f6a95192da /src/H5AC.c | |
parent | 3a6668b2f948d266bf7c99d641c331ff09021ceb (diff) | |
download | hdf5-153444fed7bd9dfb2b7d90a47c79d11bd1188e96.zip hdf5-153444fed7bd9dfb2b7d90a47c79d11bd1188e96.tar.gz hdf5-153444fed7bd9dfb2b7d90a47c79d11bd1188e96.tar.bz2 |
[svn-r8800] Purpose:
Code cleanup
Description:
Fix problems when compiling with C++ compiler.
Also clean up some warnings with gcc 3.4.x
Platforms tested:
FreeBSD 4.10 (sleipnir)
Too minor to require h5committest
Diffstat (limited to 'src/H5AC.c')
-rw-r--r-- | src/H5AC.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -369,7 +369,7 @@ H5AC_create(const H5F_t *f, cache_ptr = H5C_create(H5C__DEFAULT_MAX_CACHE_SIZE, H5C__DEFAULT_MIN_CLEAN_SIZE, (H5AC_NTYPES - 1), - &H5AC_entry_type_names, + (const char **)H5AC_entry_type_names, H5AC_check_if_write_permitted); if ( NULL == cache_ptr ) { @@ -378,7 +378,7 @@ H5AC_create(const H5F_t *f, } else { - f->shared->cache = (struct H5AC_t *)cache_ptr; + f->shared->cache = (H5AC_t *)cache_ptr; } @@ -620,7 +620,7 @@ H5AC_set(H5F_t *f, info_ptr->addr = addr; info_ptr->type = type; - info_ptr->protected = FALSE; + info_ptr->is_protected = FALSE; #ifdef H5_HAVE_PARALLEL #ifdef H5_HAVE_FPHDF5 @@ -966,7 +966,7 @@ H5AC_protect(H5F_t *f, info_ptr->addr = addr; info_ptr->type = type; - info_ptr->protected = TRUE; + info_ptr->is_protected = TRUE; if ( (type->size)(f, thing, &(info_ptr->size)) < 0 ) { @@ -1119,9 +1119,9 @@ H5AC_unprotect(H5F_t *f, if ( H5FD_is_fphdf5_driver(lf) ) { - HDassert( info_ptr->protected ); + HDassert( info_ptr->is_protected ); - info_ptr->protected = FALSE; + info_ptr->is_protected = FALSE; /* * FIXME: If the metadata is *really* deleted at this point |