summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-05-28 12:38:36 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-05-28 12:38:36 (GMT)
commitf148235ef34b20b1ff5764856b6360ec1f4cb5ab (patch)
tree40173caeef043e22b414fbf8418f12691f95efaa
parent464c3245b8ac8acdff3988515664e224bb815cfa (diff)
downloadhdf5-f148235ef34b20b1ff5764856b6360ec1f4cb5ab.zip
hdf5-f148235ef34b20b1ff5764856b6360ec1f4cb5ab.tar.gz
hdf5-f148235ef34b20b1ff5764856b6360ec1f4cb5ab.tar.bz2
[svn-r6920] Purpose:
Bug fix Description: (void *)~((size_t)NULL) on the Cray is a different value than (foo *)~((size_t)NULL) and causes some of the hyperslab algorithms to fail. Solution: Change all the 'void *' forms to 'foo *' forms. Platforms tested: Cray SV1 h5committest not needed.
-rw-r--r--src/H5Shyper.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 5866169..0687251 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -774,9 +774,9 @@ H5S_hyper_span_precompute_helper (H5S_hyper_span_info_t *spans, size_t elmt_size
assert(spans);
/* Check if we've already set this down span tree */
- if(spans->scratch!=(void *)~((size_t)NULL)) {
+ if(spans->scratch!=(H5S_hyper_span_info_t *)~((size_t)NULL)) {
/* Set the tree's scratch pointer */
- spans->scratch=(void *)~((size_t)NULL);
+ spans->scratch=(H5S_hyper_span_info_t *)~((size_t)NULL);
/* Set the scratch pointers in all the nodes */
span=spans->head;
@@ -926,7 +926,7 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
assert(spans);
/* Check if the span tree was already copied */
- if(spans->scratch!=NULL && spans->scratch!=(void *)~((size_t)NULL)) {
+ if(spans->scratch!=NULL && spans->scratch!=(H5S_hyper_span_info_t *)~((size_t)NULL)) {
/* Just return the value of the already copied span tree */
ret_value=spans->scratch;