diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-10-10 23:20:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-10 23:20:50 (GMT) |
| commit | 057e489276f0bd0a05a0264b9e4fc8a12cf1825d (patch) | |
| tree | 219487962fa9bba7b1ca4f90360f25fdead56c22 | |
| parent | d4b1ee1d861686b97a887f47ff3857e338d3f690 (diff) | |
| parent | de96f92068476f9568487c7417c9635f0ff5655d (diff) | |
| download | hdf5-057e489276f0bd0a05a0264b9e4fc8a12cf1825d.zip hdf5-057e489276f0bd0a05a0264b9e4fc8a12cf1825d.tar.gz hdf5-057e489276f0bd0a05a0264b9e4fc8a12cf1825d.tar.bz2 | |
Merge pull request #32 from lrknox/hdf5_1_12
Hdf5 1 12
| -rw-r--r-- | release_docs/INSTALL | 2 | ||||
| -rw-r--r-- | src/H5Cmpio.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release_docs/INSTALL b/release_docs/INSTALL index e38dcf9..91ae733 100644 --- a/release_docs/INSTALL +++ b/release_docs/INSTALL @@ -354,7 +354,7 @@ CONTENTS `--enable-build-mode=debug'; to compile with optimizations (the default for supported public releases), say `--enable-build-mode=production'. For a 'clean slate' configuration - with optimization disabled and nothing turned on, + with optimization disabled and nothing turned on, say `--enable-build-mode=clean'. On some systems the library can also be compiled for profiling with gprof by saying `--enable-profiling'. diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c index e529c58..6c0c015 100644 --- a/src/H5Cmpio.c +++ b/src/H5Cmpio.c @@ -457,7 +457,7 @@ H5C_construct_candidate_list__clean_cache(H5C_t *cache_ptr) entry_ptr = cache_ptr->dLRU_tail_ptr; while ((nominated_entries_size < space_needed) && - ((!cache_ptr->slist_enabled) || (nominated_entries_count < cache_ptr->slist_len)) && + (nominated_entries_count < cache_ptr->slist_len) && (entry_ptr != NULL)) { HDassert(!(entry_ptr->is_protected)); |