summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>1999-06-17 00:16:12 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>1999-06-17 00:16:12 (GMT)
commita7042d44930499f07b187e1695e5f139c8a6ff2f (patch)
tree0942061b93e4e84ba915dd3dfde1382ea6e3bddd
parenta4cd66d5e5ffaaccbde47bbfc744fa02fdc73a50 (diff)
downloadhdf5-a7042d44930499f07b187e1695e5f139c8a6ff2f.zip
hdf5-a7042d44930499f07b187e1695e5f139c8a6ff2f.tar.gz
hdf5-a7042d44930499f07b187e1695e5f139c8a6ff2f.tar.bz2
[svn-r1357] Fixed some typo and missing #include. Works again for
the Parallel version.
-rw-r--r--src/H5D.c11
-rw-r--r--src/H5T.c2
2 files changed, 9 insertions, 4 deletions
diff --git a/src/H5D.c b/src/H5D.c
index b8841af..56db7e0 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -32,6 +32,11 @@ static char RcsId[] = "@(#)$Revision$";
#include <H5Vprivate.h> /* Vector and array functions */
#include <H5Zprivate.h> /* Data filters */
+#ifdef HAVE_PARALLEL
+/* Remove this if H5R_DATASET_REGION is no longer used in this file */
+#include <H5Rpublic.h>
+#endif
+
#define PABLO_MASK H5D_mask
/*
@@ -1860,7 +1865,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
/* If MPIO is used, no VL datatype support yet. */
/* This is because they use the global heap in the file and we don't */
/* support parallel access of that yet */
- if (f->shared->access_parms->driver == H5F_LOW_MPIO &&
+ if (H5F_LOW_MPIO==dataset->ent.file->shared->access_parms->driver &&
H5T_get_class(mem_type)==H5T_VLEN) {
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, NULL,
"Parallel IO does not support writing VL datatypes yet");
@@ -1870,9 +1875,9 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
/* If MPIO is used, no dataset region reference support yet. */
/* This is because they use the global heap in the file and we don't */
/* support parallel access of that yet */
- if (f->shared->access_parms->driver == H5F_LOW_MPIO &&
+ if (H5F_LOW_MPIO==dataset->ent.file->shared->access_parms->driver &&
H5T_get_class(mem_type)==H5T_REFERENCE &&
- H5R_get_ref_type(mem_type)==H5R_DATASET_REGION) {
+ H5T_get_ref_type(mem_type)==H5R_DATASET_REGION) {
HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, NULL,
"Parallel IO does not support writing VL datatypes yet");
}
diff --git a/src/H5T.c b/src/H5T.c
index 0f0465a..2d77793 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -6950,7 +6950,7 @@ H5T_debug(H5T_t *dt, FILE *stream)
/*--------------------------------------------------------------------------
NAME
- H5R_get_ref_type
+ H5T_get_ref_type
PURPOSE
Retrieves the type of reference for a datatype
USAGE