summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-07-24 21:33:09 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-07-24 21:33:09 (GMT)
commitdecf1830efac293971cf7119c15fc1c9993263e9 (patch)
treea58a762dd1d57d510294eaf546a91420483bf972
parentc5b28bc035f275eb566806515cbda09e59d5b390 (diff)
downloadhdf5-decf1830efac293971cf7119c15fc1c9993263e9.zip
hdf5-decf1830efac293971cf7119c15fc1c9993263e9.tar.gz
hdf5-decf1830efac293971cf7119c15fc1c9993263e9.tar.bz2
[svn-r14009] Description:
Drop use of "use the latest format" flag when encoding SOHM-stored shared messages and just change the version based solely on the type of shared message. Tested on: FreeBSD/32 6.2 (duty) FreeBSD/64 6.2 (liberty) Linux/32 2.6 (kagiso) Mac OS X/32 10.4.10 (amazon) Solaris/32 2.10 (linew)
-rw-r--r--src/H5Oshared.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 9d4fd73..5739016 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -56,7 +56,7 @@
/* Older version, with just address of object as link for object header sharing */
#define H5O_SHARED_VERSION_2 2
-/* Newest version, which recognizes messages that are stored in the heap */
+/* Newest version, which recognizes messages that are stored in the SOHM heap */
#define H5O_SHARED_VERSION_3 3
#define H5O_SHARED_VERSION_LATEST H5O_SHARED_VERSION_3
@@ -378,7 +378,7 @@ H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_me
/* If this message is shared in the heap, we need to use version 3 of the
* encoding and encode the SHARED_IN_HEAP flag.
*/
- if(sh_mesg->type == H5O_SHARE_TYPE_SOHM || H5F_USE_LATEST_FORMAT(f))
+ if(sh_mesg->type == H5O_SHARE_TYPE_SOHM)
version = H5O_SHARED_VERSION_LATEST;
else {
HDassert(sh_mesg->type == H5O_SHARE_TYPE_COMMITTED);