diff options
| author | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-19 14:09:44 (GMT) |
| commit | 628d267162895adef5a73e1cd5810030cc98335a (patch) | |
| tree | 05471ae798eaef041ea98fecdd285c9380ce381a /src/H5Clog_json.c | |
| parent | d46ea2d08af456f1cfaf6c6fd3060f39b92be8de (diff) | |
| parent | 7e93acd94f20c73d27bb2eb4f7b4389d88cfb299 (diff) | |
| download | hdf5-628d267162895adef5a73e1cd5810030cc98335a.zip hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.gz hdf5-628d267162895adef5a73e1cd5810030cc98335a.tar.bz2 | |
merge and fix conflict
Diffstat (limited to 'src/H5Clog_json.c')
| -rw-r--r-- | src/H5Clog_json.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Clog_json.c b/src/H5Clog_json.c index 38aedf9..5ac354d 100644 --- a/src/H5Clog_json.c +++ b/src/H5Clog_json.c @@ -1281,7 +1281,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5C__json_write_set_cache_config_log_msg(void *udata, const H5AC_cache_config_t H5_ATTR_SANITY_CHECK *config, +H5C__json_write_set_cache_config_log_msg(void *udata, const H5AC_cache_config_t H5_ATTR_NDEBUG_UNUSED *config, herr_t fxn_ret_value) { H5C_log_json_udata_t *json_udata = (H5C_log_json_udata_t *)(udata); |