diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-14 17:28:27 (GMT) |
| commit | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (patch) | |
| tree | 3b7ce8804ae917fd71e995a39b4ccb08d2aa7169 /src/H5Tdeprec.c | |
| parent | 156baee37112996291f9ff07760be047d0e03c76 (diff) | |
| parent | 71b817038d8cd82163cf71119873b2ba65a2c81b (diff) | |
| download | hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.zip hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.gz hdf5-d46ea2d08af456f1cfaf6c6fd3060f39b92be8de.tar.bz2 | |
merge and fix conflicts
Diffstat (limited to 'src/H5Tdeprec.c')
| -rw-r--r-- | src/H5Tdeprec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c index 6ee0cd7..9998317 100644 --- a/src/H5Tdeprec.c +++ b/src/H5Tdeprec.c @@ -137,7 +137,8 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier") /* Commit the datatype */ - if(NULL == (data = H5VL_datatype_commit(vol_obj, &loc_params, name, type_id, H5P_LINK_CREATE_DEFAULT, H5P_DATATYPE_CREATE_DEFAULT, H5P_DATATYPE_ACCESS_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL))) + if(NULL == (data = H5VL_datatype_commit(vol_obj, &loc_params, name, type_id, H5P_LINK_CREATE_DEFAULT, + H5P_DATATYPE_CREATE_DEFAULT, H5P_DATATYPE_ACCESS_DEFAULT, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype") /* Set up VOL object */ |