diff options
| author | lrknox <lrknox> | 2018-05-11 16:02:43 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2018-05-11 16:02:43 (GMT) |
| commit | aa52644d1f9e5a1103e4f670b56074c4e46a04f2 (patch) | |
| tree | 0b38858f2936f4b91b22e392f249151b5ed4c3cc /src/H5Tprivate.h | |
| parent | 0cd35505fce196095b8ba4254cb76a976c026a1c (diff) | |
| download | hdf5-aa52644d1f9e5a1103e4f670b56074c4e46a04f2.zip hdf5-aa52644d1f9e5a1103e4f670b56074c4e46a04f2.tar.gz hdf5-aa52644d1f9e5a1103e4f670b56074c4e46a04f2.tar.bz2 | |
Address compile errors and merge conflicts.
Diffstat (limited to 'src/H5Tprivate.h')
| -rw-r--r-- | src/H5Tprivate.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index 47266d3..f519141 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -112,11 +112,8 @@ H5_DLL H5T_class_t H5T_get_class(const H5T_t *dt, htri_t internal); H5_DLL htri_t H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api); H5_DLL size_t H5T_get_size(const H5T_t *dt); H5_DLL int H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset); -<<<<<<< HEAD -======= H5_DLL herr_t H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc); H5_DLL H5T_t *H5T_decode(size_t buf_size, const unsigned char *buf); ->>>>>>> 302053f... Fix for HDFFV-10355 (CVE-2017-17506). H5_DLL herr_t H5T_debug(const H5T_t *dt, FILE * stream); H5_DLL struct H5O_loc_t *H5T_oloc(H5T_t *dt); H5_DLL H5G_name_t *H5T_nameof(H5T_t *dt); |