summaryrefslogtreecommitdiffstats
path: root/src/H5Sprivate.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-12-20 22:37:21 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-12-20 22:37:21 (GMT)
commitbffc42f6ac251d7a4d6b77721563ba2122fdddd6 (patch)
treec133f51e7ab6b01f7659e7e1d3ccd6120b5d12dc /src/H5Sprivate.h
parent491971980d68bb763899d42946a63fc127f9c4cb (diff)
downloadhdf5-bffc42f6ac251d7a4d6b77721563ba2122fdddd6.zip
hdf5-bffc42f6ac251d7a4d6b77721563ba2122fdddd6.tar.gz
hdf5-bffc42f6ac251d7a4d6b77721563ba2122fdddd6.tar.bz2
[svn-r14356] Description:
Refactor work for bug #956 to simplify a bit and to cover some corner cases. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.4.10 (amazon) in debug mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Sprivate.h')
-rw-r--r--src/H5Sprivate.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index 64bf3a5..aa8a418 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -78,8 +78,9 @@ typedef struct {
/* "Flattened" regular hyperslab selection fields */
H5S_hyper_dim_t diminfo[H5S_MAX_RANK]; /* "Flattened" regular selection information */
- hsize_t size[H5S_MAX_RANK]; /* "Flattened" dataspace extent information */
- hssize_t sel_off[H5S_MAX_RANK]; /* "Flattened" selection offset information */
+ hsize_t size[H5S_MAX_RANK]; /* "Flattened" dataspace extent information */
+ hssize_t sel_off[H5S_MAX_RANK]; /* "Flattened" selection offset information */
+ hbool_t flattened[H5S_MAX_RANK]; /* Whether this dimension has been flattened */
/* Irregular hyperslab selection fields */
H5S_hyper_span_info_t *spans; /* Pointer to copy of the span tree */
@@ -103,7 +104,6 @@ typedef struct H5S_sel_iter_t {
/* Information common to all iterators */
unsigned rank; /* Rank of dataspace the selection iterator is operating on */
hsize_t *dims; /* Dimensions of dataspace the selection is operating on */
- hbool_t *dims_flatten;
hsize_t elmt_left; /* Number of elements left to iterate over */
size_t elmt_size; /* Size of elements to iterate over */