diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-25 21:09:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-25 21:09:28 (GMT) |
| commit | 41a1614db8e87263916e3d3415b9806596f85ede (patch) | |
| tree | 3cdd1345b844282dd21f586459fb39f1f36c0233 /src | |
| parent | 896f001f33ef55ac8b669acd3195fddc763eaf0a (diff) | |
| download | hdf5-41a1614db8e87263916e3d3415b9806596f85ede.zip hdf5-41a1614db8e87263916e3d3415b9806596f85ede.tar.gz hdf5-41a1614db8e87263916e3d3415b9806596f85ede.tar.bz2 | |
[svn-r12629] Description:
Rearrange code to avoid compiler bugs on tg-login3 machine with
gcc 3.2.2
Tested on:
tg-login3
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5HFtiny.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/H5HFtiny.c b/src/H5HFtiny.c index 5183a39..bcbe0eb 100644 --- a/src/H5HFtiny.c +++ b/src/H5HFtiny.c @@ -220,7 +220,10 @@ H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p) if(!hdr->tiny_len_extended) enc_obj_size = *id & H5HF_TINY_MASK_SHORT; else - enc_obj_size = ((*id & H5HF_TINY_MASK_EXT_1) << 8) | (*(id + 1) & H5HF_TINY_MASK_EXT_2); + /* (performed in this odd way to avoid compiler bug on tg-login3 with + * gcc 3.2.2 - QAK) + */ + enc_obj_size = *(id + 1) | ((*id & H5HF_TINY_MASK_EXT_1) << 8); /* Set the object's length */ *obj_len_p = enc_obj_size + 1; @@ -245,7 +248,7 @@ H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p) herr_t H5HF_tiny_read(H5HF_hdr_t *hdr, const uint8_t *id, void *obj) { - size_t enc_obj_size; /* Encoded object size */ + size_t enc_obj_size; /* Encoded object size */ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_tiny_read) @@ -266,10 +269,16 @@ H5HF_tiny_read(H5HF_hdr_t *hdr, const uint8_t *id, void *obj) } /* end if */ else { /* Retrieve the object's encoded length */ - enc_obj_size = ((*id & H5HF_TINY_MASK_EXT_1) << 8) | (*(id + 1) & H5HF_TINY_MASK_EXT_2); + /* (performed in this odd way to avoid compiler bug on tg-login3 with + * gcc 3.2.2 - QAK) + */ + enc_obj_size = *(id + 1) | ((*id & H5HF_TINY_MASK_EXT_1) << 8); /* Advance past flag byte(s) */ - id+=2; + /* (performed in two steps to avoid compiler bug on tg-login3 with + * gcc 3.2.2 - QAK) + */ + id++; id++; } /* end else */ /* Retrieve the object's data */ @@ -310,7 +319,10 @@ H5HF_tiny_remove(H5HF_hdr_t *hdr, const uint8_t *id) if(!hdr->tiny_len_extended) enc_obj_size = *id & H5HF_TINY_MASK_SHORT; else - enc_obj_size = ((*id & H5HF_TINY_MASK_EXT_1) << 8) | (*(id + 1) & H5HF_TINY_MASK_EXT_2); + /* (performed in this odd way to avoid compiler bug on tg-login3 with + * gcc 3.2.2 - QAK) + */ + enc_obj_size = *(id + 1) | ((*id & H5HF_TINY_MASK_EXT_1) << 8); /* Update statistics about heap */ hdr->tiny_size -= (enc_obj_size + 1); |