diff options
| author | David Young <dyoung@hdfgroup.org> | 2019-12-19 20:55:49 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2019-12-19 20:55:49 (GMT) |
| commit | d11b347aa77cbcfa2bf782c8856bf559444ad880 (patch) | |
| tree | df43489411575f566e0475ad4bb040dc69f623e6 /src/H5Fprivate.h | |
| parent | 4281d101c41f80a75143c0d40232383a81afc7f0 (diff) | |
| parent | 817235bb60e1f79c4b22b4a6116a1594aa75b81d (diff) | |
| download | hdf5-d11b347aa77cbcfa2bf782c8856bf559444ad880.zip hdf5-d11b347aa77cbcfa2bf782c8856bf559444ad880.tar.gz hdf5-d11b347aa77cbcfa2bf782c8856bf559444ad880.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '817235bb60e1f79c4b22b4a6116a1594aa75b81d': (145 commits)
Remove const
Fix compile error - declaration after executable statement
Adjust cache.c only variables.
Fix include to correct memory calls - big-endian issue.
Update h5debug to retrieve file pointer through VOL framework
Minor whitespace
Remove duplicate instance
Revert and move declaration
Correct struct access
Fix duplicate and varname
Fix compile and test issues from DT
Modify H5VL initialization routines to initialize all VOL-managed object types. Modify H5VLwrap_register() to reject non-VOL-managed object types. Also fix overisights in h5trace.c from previous changes.
Add release note for sanitizer support
HDFFV-10979 cleanup globals
TRILABS-135 Add clang analyzers
HDFFV-10979 fix global name clash
Fix issues found with ONLY_SHARED_LIBS option
Fix 2010 compile issues
Change from using H5Dcreate to H5Dcreate2
Latest date first in RELEASE.txt
...
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index e1a8a2f..4008eb8 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -730,9 +730,10 @@ typedef enum H5F_prefix_open_t { /***************************************/ /* Private functions */ +H5_DLL herr_t H5F_init(void); H5_DLL H5F_t *H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id); H5_DLL herr_t H5F_try_close(H5F_t *f, hbool_t *was_closed/*out*/); -H5_DLL hid_t H5F_get_file_id(hid_t obj_id, H5I_type_t id_type, hbool_t app_ref); +H5_DLL hid_t H5F_get_file_id(H5VL_object_t *vol_obj, H5I_type_t obj_type, hbool_t app_ref); /* Functions that retrieve values from the file struct */ H5_DLL H5F_libver_t H5F_get_low_bound(const H5F_t *f); |