diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-04-06 14:21:06 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-04-06 14:21:06 (GMT) |
| commit | 5e943e85e27645f03ec44fe36d007821bf29d6b6 (patch) | |
| tree | 0ea16d3d7cbb1f20ed6aba5d132df311b19635a7 /src/H5FSpkg.h | |
| parent | f6a5236e43ab8d461d472ecda9d70297fb7a53b5 (diff) | |
| parent | 048ae59d2970dd21810577c999f756c028b6faaf (diff) | |
| download | hdf5-5e943e85e27645f03ec44fe36d007821bf29d6b6.zip hdf5-5e943e85e27645f03ec44fe36d007821bf29d6b6.tar.gz hdf5-5e943e85e27645f03ec44fe36d007821bf29d6b6.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '048ae59d2970dd21810577c999f756c028b6faaf':
Correct errors with non-"instrumented library" builds (production & parallel, generally speaking).
Update java error stack tests
Revert using H5MF_sect_small_can_shrink and H5MF_sect_small_shrink for the file's free space manager (and add a comment about them).
Add comment for the file flush when the file low / high bounds are changed after a file is open.
Expanded comments abuot H5CX_t fields.
Add an assert to verify that we don't write when between MPI_Barrier() calls during a flush.
Add comments for internal structs.
Remove redundant 'is_collective' parameter from H5CX_set_loc.
Correct typo in comment.
Revert some tangential code cleanups.
Add API context source files to CMake configuration file.
Corrections for parallel I/O & tests.
Update handling of reporting for breaking collective I/O when the default DXPL is used.
Update encoded DXPLs to reflect changes in properties.
Correct typo for error checking malloc return value.
Refactor H5CX code to reduce duplication.
Cleanup API context function usage.
Add API context interface and use it throughout the library.
Diffstat (limited to 'src/H5FSpkg.h')
| -rw-r--r-- | src/H5FSpkg.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h index df1d92f..23e1212 100644 --- a/src/H5FSpkg.h +++ b/src/H5FSpkg.h @@ -104,7 +104,6 @@ typedef struct H5FS_hdr_cache_ud_t { typedef struct H5FS_sinfo_cache_ud_t { H5F_t *f; /* File that free space section info is within */ H5FS_t *fspace; /* free space manager */ - hid_t dxpl_id; } H5FS_sinfo_cache_ud_t; /* Free space section bin info */ @@ -237,8 +236,8 @@ H5_DLL herr_t H5FS_sinfo_dest(H5FS_sinfo_t *sinfo); /* Sanity check routines */ #ifdef H5FS_DEBUG -H5_DLL herr_t H5FS_assert(const H5FS_t *fspace, hid_t dxpl_id); -H5_DLL herr_t H5FS_sect_assert(const H5FS_t *fspace, hid_t dxpl_id); +H5_DLL herr_t H5FS__assert(const H5FS_t *fspace); +H5_DLL herr_t H5FS__sect_assert(const H5FS_t *fspace); #endif /* H5FS_DEBUG */ /* Testing routines */ |