summaryrefslogtreecommitdiffstats
path: root/src/H5Cmpio.c
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2020-10-10 12:38:20 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2020-10-10 12:38:20 (GMT)
commitde96f92068476f9568487c7417c9635f0ff5655d (patch)
tree219487962fa9bba7b1ca4f90360f25fdead56c22 /src/H5Cmpio.c
parentd282d8e8468cfd67172fe8b7db0786d9cdf33e03 (diff)
downloadhdf5-de96f92068476f9568487c7417c9635f0ff5655d.zip
hdf5-de96f92068476f9568487c7417c9635f0ff5655d.tar.gz
hdf5-de96f92068476f9568487c7417c9635f0ff5655d.tar.bz2
Remove 1 addition to src/H5Cmpio.c of member added to H5C_t struct in develop branch inadvertently and partially merged to hdf5_1_12 branch. The addition breaks compile with parallel enabled; removing it restores compile, tested with MPICH 3.3 and OpenMPI 4.0.0.
e with '#' will be ignored, and an empty message aborts the commit.
Diffstat (limited to 'src/H5Cmpio.c')
-rw-r--r--src/H5Cmpio.c2
1 files changed, 1 insertions, 1 deletions
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));