diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-03 08:48:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-03 08:48:50 (GMT) |
| commit | 3cd705e56e6ef13c3423df68bb12704d483409ae (patch) | |
| tree | f5010140d9de52c26e5d312532cfc64500988f24 /src/H5Opkg.h | |
| parent | 9d2178ab886ae957cfe11b6fe09f9e7f0e9ce369 (diff) | |
| download | hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.zip hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.tar.gz hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.tar.bz2 | |
[svn-r29612] Description:
Bring updated layout and EFL property comparisons and new "latest format"
flags from revise_chunks branch.
Tested on:
MacOSX/64 10.11.4 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5Opkg.h')
| -rw-r--r-- | src/H5Opkg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Opkg.h b/src/H5Opkg.h index cc1b289..5bce19e 100644 --- a/src/H5Opkg.h +++ b/src/H5Opkg.h @@ -66,7 +66,7 @@ #define H5O_ALIGN_OH(O, X) \ H5O_ALIGN_VERS((O)->version, X) #define H5O_ALIGN_F(F, X) \ - H5O_ALIGN_VERS((H5F_USE_LATEST_FORMAT(F) ? H5O_VERSION_LATEST : H5O_VERSION_1), X) + H5O_ALIGN_VERS((H5F_USE_LATEST_FLAGS(F, H5F_LATEST_OBJ_HEADER) ? H5O_VERSION_LATEST : H5O_VERSION_1), X) /* Size of checksum (on disk) */ #define H5O_SIZEOF_CHKSUM 4 @@ -138,7 +138,7 @@ #define H5O_SIZEOF_MSGHDR_OH(O) \ H5O_SIZEOF_MSGHDR_VERS((O)->version, (O)->flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED) #define H5O_SIZEOF_MSGHDR_F(F, C) \ - H5O_SIZEOF_MSGHDR_VERS((H5F_USE_LATEST_FORMAT(F) || H5F_STORE_MSG_CRT_IDX(F)) ? H5O_VERSION_LATEST : H5O_VERSION_1, (C)) + H5O_SIZEOF_MSGHDR_VERS((H5F_USE_LATEST_FLAGS(F, H5F_LATEST_OBJ_HEADER) || H5F_STORE_MSG_CRT_IDX(F)) ? H5O_VERSION_LATEST : H5O_VERSION_1, (C)) /* * Size of chunk "header" for each chunk |