diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-16 22:17:29 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-16 22:17:29 (GMT) |
| commit | db2c4c497abab139485dbf6797e56b1340e4577d (patch) | |
| tree | f7dfb321a3643658ed24aaf776ec4c1e48bc76a3 /src/H5Fpkg.h | |
| parent | 55af47c47c3c0c7bc17266968f5e0e782189e819 (diff) | |
| download | hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.zip hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.tar.gz hdf5-db2c4c497abab139485dbf6797e56b1340e4577d.tar.bz2 | |
[svn-r15221] Description:
Bring changes from trunk from the time the branch was created (r14280)
up to the 1.8.0 release (r14525) back into the metadata journaling branch.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Fpkg.h')
| -rw-r--r-- | src/H5Fpkg.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h index 9df85bb..bea0579 100644 --- a/src/H5Fpkg.h +++ b/src/H5Fpkg.h @@ -90,7 +90,7 @@ typedef struct H5F_file_t { unsigned sohm_vers; /* Version of shared message table on disk */ unsigned sohm_nindexes; /* Number of shared messages indexes in the table */ haddr_t driver_addr; /* File driver information block address*/ - hbool_t fam_to_sec2; /* Is h5repart changing driver from family to sec2 */ + haddr_t maxaddr; /* Maximum address for file */ H5AC_t *cache; /* The object cache */ H5AC2_t *cache2; /* test cache */ @@ -109,7 +109,8 @@ typedef struct H5F_file_t { hsize_t alignment; /* Alignment */ unsigned gc_ref; /* Garbage-collect references? */ hbool_t latest_format; /* Always use the latest format? */ - hbool_t store_msg_crt_idx; /* Store creation index for object header messages? */ + hbool_t store_msg_crt_idx; /* Store creation index for object header messages? */ + hbool_t fam_to_sec2; /* Is h5repart changing driver from family to sec2? */ int ncwfs; /* Num entries on cwfs list */ struct H5HG_heap_t **cwfs; /* Global heap cache */ struct H5G_t *root_grp; /* Open root group */ |