diff options
| author | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-29 20:12:18 (GMT) |
|---|---|---|
| committer | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-29 20:12:18 (GMT) |
| commit | 8c60f6264c46cd9155ce34e12e29e9b0272c0c67 (patch) | |
| tree | 4ee7db9cfd3ff489825e82a23b6e010245fe4183 /src/H5Clog_json.c | |
| parent | 91d29817413e00f1dcd006d13790df6ce7aeb5c0 (diff) | |
| parent | 781fa57f6ee816e037dd12fff02d37ff7ec9c2b1 (diff) | |
| download | hdf5-8c60f6264c46cd9155ce34e12e29e9b0272c0c67.zip hdf5-8c60f6264c46cd9155ce34e12e29e9b0272c0c67.tar.gz hdf5-8c60f6264c46cd9155ce34e12e29e9b0272c0c67.tar.bz2 | |
Merge pull request #2324 in HDFFV/hdf5 from ~KMU/hdf5:hdf5_1_12 to hdf5_1_12
* commit '781fa57f6ee816e037dd12fff02d37ff7ec9c2b1':
pick up missing piece from merge
Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop
remove redundent definition
Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop
Merge pull request #2311 in HDFFV/hdf5 from ~KMU/hdf5:misc to develop
Merge pull request #2315 in HDFFV/hdf5 from ~KMU/hdf5:develop to develop
missing prototype warning
prototype issue
Merge pull request #2306 in HDFFV/hdf5 from ~KMU/hdf5:develop to develop
Merge pull request #2300 in HDFFV/hdf5 from ~KMU/hdf5:squashed_cast to develop
Merge pull request #2291 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/uninitialized to develop
Merge pull request #2295 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/float to develop
Merge pull request #2292 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/prototype to develop
Merge pull request #2094 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/unused to develop
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 dd9e9b2..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 *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); |