diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-02-29 00:27:00 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-02-29 00:27:00 (GMT) |
| commit | 8249dc6e3d45b58aa734c1269c4735922cb5a168 (patch) | |
| tree | a35fb122ef48436d1161dc2cbfffcb65e437990e /src/H5Fsuper_cache.c | |
| parent | 594189a67300329207f21198a2606175acc4b89e (diff) | |
| parent | 8cd0b0aff8551345c84f75ea3c504a97cd87778b (diff) | |
| download | hdf5-8249dc6e3d45b58aa734c1269c4735922cb5a168.zip hdf5-8249dc6e3d45b58aa734c1269c4735922cb5a168.tar.gz hdf5-8249dc6e3d45b58aa734c1269c4735922cb5a168.tar.bz2 | |
[svn-r29224] Brought alpha2 branch in sync with revise_chunks (up to r29219)
Note: generated autotools files are from a VM and not THG
machines. These will be updated immediately after
check-in.
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial w/ Fortran & C++
autotools parallel (MPICH 3.1.4) w/ Fortran
CMake serial (cmakehdf5 w/ CMake 3.3.2)
Diffstat (limited to 'src/H5Fsuper_cache.c')
| -rw-r--r-- | src/H5Fsuper_cache.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c index 6f37ff6..e0b5df5 100644 --- a/src/H5Fsuper_cache.c +++ b/src/H5Fsuper_cache.c @@ -727,9 +727,6 @@ H5F__cache_superblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNU /* (We'll rely on the cache to make sure it actually *is* flushed last (and collectively in parallel), but this check doesn't hurt) */ HDassert(sblock->cache_info.flush_me_last); -#ifdef H5_HAVE_PARALLEL - HDassert(sblock->cache_info.flush_me_collectively); -#endif /* Encode the common portion of the file superblock for all versions */ HDmemcpy(image, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN); |