diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-06-27 15:44:50 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-06-27 15:44:50 (GMT) |
commit | 0fe43fbf2cd56f142ec322daca2a669fac8243ed (patch) | |
tree | f01427e9de3133b822475e1aeb3c73ad21a4ec1f /src/H5Dpkg.h | |
parent | 7320a66aa7224549c308132a796cef325d377116 (diff) | |
parent | a4dc3ff34d2dec4db339851df381b67970853f2a (diff) | |
download | hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.zip hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.tar.gz hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.tar.bz2 |
[svn-r23834] merge from trunk up to r23833.
Fixed several conflicts, mostly because calling API routines internally was removed from several places in the trunk.
Diffstat (limited to 'src/H5Dpkg.h')
-rw-r--r-- | src/H5Dpkg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h index ed6da8f..bc862dd 100644 --- a/src/H5Dpkg.h +++ b/src/H5Dpkg.h @@ -479,7 +479,8 @@ typedef struct H5D_fill_buf_info_t { /* Internal data structure for computing variable-length dataset's total size */ typedef struct { - hid_t dataset_id; /* ID of the dataset we are working on */ + void *dset; /* Dataset for operation */ + H5VL_t *vol_plugin; /* VOL plugin the dataset belongs to */ hid_t fspace_id; /* ID of the file dataset's dataspace we are working on */ hid_t mspace_id; /* ID of the memory dataset's dataspace we are working on */ void *fl_tbuf; /* Ptr to the temporary buffer we are using for fixed-length data */ |