diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-30 06:10:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-30 06:10:38 (GMT) |
| commit | bd33a9d6da4f56884eaf5dc750186a6c02c90446 (patch) | |
| tree | 2bb71d0ed2ebbb447c28e8e77ecf55ce01340d9f /src/H5FDlog.c | |
| parent | f63b2c50ac95fb8363a9b8143d3a3d5f50c58d35 (diff) | |
| download | hdf5-bd33a9d6da4f56884eaf5dc750186a6c02c90446.zip hdf5-bd33a9d6da4f56884eaf5dc750186a6c02c90446.tar.gz hdf5-bd33a9d6da4f56884eaf5dc750186a6c02c90446.tar.bz2 | |
[svn-r29842] Description:
Bring [appropriate portions of] r29811, 29813, 29826, 29830, 29831 from
revise_chunks branch to the trunk.
Tested on:
MacOSX/64 10.11.4 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5FDlog.c')
| -rw-r--r-- | src/H5FDlog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 4bb72ce..d0c4647 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -416,7 +416,7 @@ done: if(NULL == ret_value) if(new_fa) { if(new_fa->logfile) - new_fa->logfile = H5MM_xfree(new_fa->logfile); + new_fa->logfile = (char *)H5MM_xfree(new_fa->logfile); H5MM_free(new_fa); } /* end if */ @@ -445,7 +445,7 @@ H5FD_log_fapl_free(void *_fa) /* Free the fapl information */ if(fa->logfile) - fa->logfile = H5MM_xfree(fa->logfile); + fa->logfile = (char *)H5MM_xfree(fa->logfile); H5MM_xfree(fa); FUNC_LEAVE_NOAPI(SUCCEED) @@ -799,7 +799,7 @@ H5FD_log_close(H5FD_t *_file) } /* end if */ if(file->fa.logfile) - file->fa.logfile = H5MM_xfree(file->fa.logfile); + file->fa.logfile = (char *)H5MM_xfree(file->fa.logfile); /* Release the file info */ file = H5FL_FREE(H5FD_log_t, file); |