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/H5Dsingle.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/H5Dsingle.c')
| -rw-r--r-- | src/H5Dsingle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Dsingle.c b/src/H5Dsingle.c index 3d7400d..8efa771 100644 --- a/src/H5Dsingle.c +++ b/src/H5Dsingle.c @@ -437,7 +437,7 @@ H5D__single_idx_delete(const H5D_chk_idx_info_t *idx_info) *------------------------------------------------------------------------- */ static herr_t -H5D__single_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_SANITY_CHECK *idx_info_src, +H5D__single_idx_copy_setup(const H5D_chk_idx_info_t H5_ATTR_NDEBUG_UNUSED *idx_info_src, const H5D_chk_idx_info_t *idx_info_dst) { herr_t ret_value = SUCCEED; /* Return value */ |