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/H5HGcache.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/H5HGcache.c')
| -rw-r--r-- | src/H5HGcache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HGcache.c b/src/H5HGcache.c index a2a9318..18625cc 100644 --- a/src/H5HGcache.c +++ b/src/H5HGcache.c @@ -202,7 +202,7 @@ H5HG__cache_heap_get_initial_load_size(void H5_ATTR_UNUSED *_udata, size_t *imag *------------------------------------------------------------------------- */ static herr_t -H5HG__cache_heap_get_final_load_size(const void *image, size_t H5_ATTR_SANITY_CHECK image_len, +H5HG__cache_heap_get_final_load_size(const void *image, size_t H5_ATTR_NDEBUG_UNUSED image_len, void *udata, size_t *actual_len) { H5HG_heap_t heap; /* Global heap */ @@ -432,7 +432,7 @@ H5HG__cache_heap_image_len(const void *_thing, size_t *image_len) *------------------------------------------------------------------------- */ static herr_t -H5HG__cache_heap_serialize(const H5F_t H5_ATTR_SANITY_CHECK *f, void *image, size_t len, +H5HG__cache_heap_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *image, size_t len, void *_thing) { H5HG_heap_t *heap = (H5HG_heap_t *)_thing; |