summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2016-10-27 19:10:02 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2016-10-27 19:10:02 (GMT)
commit4159dc4e587169a931c826653f3926486a350945 (patch)
treedaff1b2148c42770b0815a93d3471d816195d6e0
parente0ef8fd46411bef95fa16dc5c9001b30fb9b5795 (diff)
downloadhdf5-4159dc4e587169a931c826653f3926486a350945.zip
hdf5-4159dc4e587169a931c826653f3926486a350945.tar.gz
hdf5-4159dc4e587169a931c826653f3926486a350945.tar.bz2
Minor fixes.
-rw-r--r--src/H5VLdaosm.c6
-rw-r--r--src/hdf5.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/H5VLdaosm.c b/src/H5VLdaosm.c
index 5f7c013..22caed6 100644
--- a/src/H5VLdaosm.c
+++ b/src/H5VLdaosm.c
@@ -31,6 +31,8 @@
#include "H5VLprivate.h" /* VOL plugins */
#include "H5VLdaosm.h" /* DAOS-M plugin */
+hid_t H5VL_DAOSM_g = 0;
+
/* Prototypes */
static void *H5VL_daosm_fapl_copy(const void *_old_fa);
static herr_t H5VL_daosm_fapl_free(void *_fa);
@@ -525,7 +527,7 @@ H5VL_daosm_file_create(const char *name, unsigned flags, hid_t fcpl_id, hid_t fa
daos_obj_id_t oid = {0, 0, 0};
/* Connect to the pool */
- if(0 != daos_pool_connect(fa->pool_uuid, fa->pool_grp, NULL /*pool_svc*/, DAOS_PC_RW, &file->poh, NULL /*&file->pool_info*/, NULL /*event*/))
+ if(0 != daos_pool_connect(fa->pool_uuid, NULL/*fa->pool_grp DSMINC*/, NULL /*pool_svc*/, DAOS_PC_RW, &file->poh, NULL /*&file->pool_info*/, NULL /*event*/))
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't connect to pool")
/* Create the container for the file */
@@ -723,7 +725,7 @@ H5VL_daosm_file_open(const char *name, unsigned flags, hid_t fapl_id,
daos_obj_id_t oid = {0, 0, 0};
/* Connect to the pool */
- if(0 != daos_pool_connect(fa->pool_uuid, fa->pool_grp, NULL /*pool_svc*/, DAOS_PC_RW, &file->poh, NULL /*&file->pool_info*/, NULL /*event*/))
+ if(0 != daos_pool_connect(fa->pool_uuid, NULL/*fa->pool_grp DSMINC*/, NULL /*pool_svc*/, DAOS_PC_RW, &file->poh, NULL /*&file->pool_info*/, NULL /*event*/))
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't connect to pool")
/* Open the container */
diff --git a/src/hdf5.h b/src/hdf5.h
index 72d0ab3..5c764ba 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -42,7 +42,7 @@
#include "H5VLpublic.h" /* VOL plugins */
/* FastForward headers */
-#include "H5FFpublic.h" /* FastForward wrappers */
+//#include "H5FFpublic.h" /* FastForward wrappers */ DSMINC
#include "H5VLdaosm.h" /* DAOS-M VOL plugin */
/* Predefined VOL plugins */