Mercurial > octave-nkf
diff libinterp/corefcn/oct-hdf5.h @ 20299:bfe66db8addb
don't include hdf5.h or use HDF5 typedefs in public header files (bug #43180)
* oct-hdf5-types.h: Rename from oct-hdf5-id.h.
* oct-hdf5-types.cc: Rename from oct-hdf5-id.cc.
* libinterp/corefcn/module.mk: Update.
* oct-hdf5-types.h (octave_hdf5_err): New typedef.
* oct-hdf5-types.h, oct-hdf5-types.cc (check_hdf5_types): Rename from
check_hdf5_id_type. Also check size of herr_t.
* load-save.cc: Include oct-hdf5.h.
* ls-hdf5.cc: Include oct-hdf5.h instead of oct-hdf5-id.h.
Define hdf5_fstreambase functions that require HDF5 types here instead
of in ls-hdf5.h.
* ls-hdf5.h, ls-hdf5.cc: Use octave types in public interfaces.
* ls-hdf5.h, ov-base.h: Include oct-hdf5-types.h instead of oct-hdf5.h.
* oct-hdf5.h: Include oct-hdf5-types.h. Define H5T_NATIVE_IDX here.
* ls-hdf5.h: Not here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 15 Jun 2015 17:42:44 -0400 |
parents | 09ed6f7538dd |
children | 140ce5e857bf |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-hdf5.h Mon Jun 15 21:56:34 2015 +0200 +++ b/libinterp/corefcn/oct-hdf5.h Mon Jun 15 17:42:44 2015 -0400 @@ -27,8 +27,16 @@ #include <hdf5.h> +#include "oct-hdf5-types.h" + #define HDF5_SAVE_TYPE H5T_NATIVE_UINT8 +#ifdef USE_64_BIT_IDX_T +#define H5T_NATIVE_IDX H5T_NATIVE_INT64 +#else +#define H5T_NATIVE_IDX H5T_NATIVE_INT +#endif + #endif #endif