Mercurial > octave-nkf

comparison libinterp/corefcn/oct-hdf5.h @ 20299:bfe66db8addb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
20298:5c088348fddb 20299:bfe66db8addb
25 25
26 #if defined (HAVE_HDF5_H) 26 #if defined (HAVE_HDF5_H)
27 27
28 #include <hdf5.h> 28 #include <hdf5.h>
29 29
30 #include "oct-hdf5-types.h"
31
30 #define HDF5_SAVE_TYPE H5T_NATIVE_UINT8 32 #define HDF5_SAVE_TYPE H5T_NATIVE_UINT8
33
34 #ifdef USE_64_BIT_IDX_T
35 #define H5T_NATIVE_IDX H5T_NATIVE_INT64
36 #else
37 #define H5T_NATIVE_IDX H5T_NATIVE_INT
38 #endif
31 39
32 #endif 40 #endif
33 41
34 #endif 42 #endif