diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-04-03 21:41:28 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-04-03 21:41:28 (GMT) |
| commit | 5630846ea34f29b45aecdb431f846327c4fde9e1 (patch) | |
| tree | 83e65a0feb757f39472e70d2168048d091cfed50 /src/H5Tcommit.c | |
| parent | 820b4dc39136072bccad1455fc0232ec9e710d58 (diff) | |
| parent | b9e5e2af4e31b0a60c2d2f6421fb1b3cb9aa0564 (diff) | |
| download | hdf5-5630846ea34f29b45aecdb431f846327c4fde9e1.zip hdf5-5630846ea34f29b45aecdb431f846327c4fde9e1.tar.gz hdf5-5630846ea34f29b45aecdb431f846327c4fde9e1.tar.bz2 | |
[svn-r26724] - merge from trunk & fix conflicts.
- fix bug in opending an already open named datatype.
- fix dynamically loaded VOL plugin support with new changes coming in.
Diffstat (limited to 'src/H5Tcommit.c')
| -rw-r--r-- | src/H5Tcommit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index 315920e..bd1260e 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -717,7 +717,7 @@ H5T_open(const H5G_loc_t *loc, hid_t dxpl_id) else { if(NULL == (dt = H5FL_MALLOC(H5T_t))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for datatype") - + dt->vol_obj = NULL; #if defined(H5_USING_MEMCHECKER) || !defined(NDEBUG) /* Clear object location */ if(H5O_loc_reset(&(dt->oloc)) < 0) @@ -912,7 +912,7 @@ H5T_get_named_type(const H5T_t *dt) *------------------------------------------------------------------------- */ H5T_t * -H5T_get_actual_type(const H5T_t *dt) +H5T_get_actual_type(H5T_t *dt) { H5T_t *ret_value = NULL; /* Return value */ |