diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-02-18 17:26:38 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-02-18 17:26:38 (GMT) |
commit | 6b9ddd65980835c2bccf7458952f6c51e550bfdb (patch) | |
tree | 78c0d2f6c2821d74ca4d7babe7d6b9c07a0ab734 /src/H5SMmessage.c | |
parent | 95223419fbb4232ba0b2cc42b3f7210db9ae4915 (diff) | |
download | hdf5-6b9ddd65980835c2bccf7458952f6c51e550bfdb.zip hdf5-6b9ddd65980835c2bccf7458952f6c51e550bfdb.tar.gz hdf5-6b9ddd65980835c2bccf7458952f6c51e550bfdb.tar.bz2 |
[svn-r18276] Description:
Bring r18275 from trunk to 1.8 branch:
Remove incorrect encoding of fractal heap IDs for dense attribute storage
and dense shared object header message storage.
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug & production
(h5committested on trunk)
Diffstat (limited to 'src/H5SMmessage.c')
-rw-r--r-- | src/H5SMmessage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c index 9a214ea..32ded03 100644 --- a/src/H5SMmessage.c +++ b/src/H5SMmessage.c @@ -201,7 +201,7 @@ H5SM_message_compare(const void *rec1, const void *rec2) * message in the index, we've found the message. */ if(mesg->location == H5SM_IN_HEAP && key->message.location == H5SM_IN_HEAP) { - if(key->message.u.heap_loc.fheap_id == mesg->u.heap_loc.fheap_id) + if(key->message.u.heap_loc.fheap_id.val == mesg->u.heap_loc.fheap_id.val) HGOTO_DONE(0); } /* end if */ else if(mesg->location == H5SM_IN_OH && key->message.location == H5SM_IN_OH) { @@ -301,7 +301,7 @@ H5SM_message_encode(uint8_t *raw, const void *_nrecord, void *_ctx) if(message->location == H5SM_IN_HEAP) { UINT32ENCODE(raw, message->u.heap_loc.ref_count); - UINT64ENCODE(raw, message->u.heap_loc.fheap_id); + HDmemcpy(raw, message->u.heap_loc.fheap_id.id, (size_t)H5O_FHEAP_ID_LEN); } /* end if */ else { HDassert(message->location == H5SM_IN_OH); @@ -342,7 +342,7 @@ H5SM_message_decode(const uint8_t *raw, void *_nrecord, void *_ctx) if(message->location == H5SM_IN_HEAP) { UINT32DECODE(raw, message->u.heap_loc.ref_count); - UINT64DECODE(raw, message->u.heap_loc.fheap_id); + HDmemcpy(message->u.heap_loc.fheap_id.id, raw, (size_t)H5O_FHEAP_ID_LEN); } /* end if */ else { HDassert(message->location == H5SM_IN_OH); |